summaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-trace.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2017-11-13 09:39:12 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2017-11-13 09:39:12 -0300
commit7862edc4191123f9c7e7ec0a7b356d332a61c41e (patch)
treef3a2416c08c7ce46ce72d9fdf55b5a32328164ee /tools/perf/builtin-trace.c
parentfcdfafcb73be8fa45909327bbddca46fb362a675 (diff)
parent516fb7f2e73dcc303fb97fc3593209fcacf2d982 (diff)
downloadlinux-7862edc4191123f9c7e7ec0a7b356d332a61c41e.tar.bz2
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-trace.c')
-rw-r--r--tools/perf/builtin-trace.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 505b871fdc82..f2757d38c7d7 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -1164,6 +1164,14 @@ static int trace__symbols_init(struct trace *trace, struct perf_evlist *evlist)
return err;
}
+static void trace__symbols__exit(struct trace *trace)
+{
+ machine__exit(trace->host);
+ trace->host = NULL;
+
+ symbol__exit();
+}
+
static int syscall__alloc_arg_fmts(struct syscall *sc, int nr_args)
{
int idx;
@@ -2508,6 +2516,8 @@ out_disable:
}
out_delete_evlist:
+ trace__symbols__exit(trace);
+
perf_evlist__delete(evlist);
trace->evlist = NULL;
trace->live = false;