perf tools: Add error path into hist_entry__init
Jiri Olsa
reviewerPATCH 1/2 perf tools: Add error path into hist_entry__init
Adding error path into hist_entry__init to unify error handling, so every new member does not need to free everything else.
Signed-off-by Jiri Olsa <[email protected]>
--- tools/perf/util/hist.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)
tools/perf/util/hist.c +19 -20
@@ -396,11 +396,8 @@ static int hist_entry__init(struct hist_entry *he,* adding new entries. So we need to save a copy. */ he->branch_info =malloc (sizeof (*he->branch_info)); -if (he->branch_info ==NULL ) { -map__zput (he->ms.map); -free (he->stat_acc); -return -ENOMEM ; - } +if (he->branch_info ==NULL ) + goto err;memcpy (he->branch_info, template->branch_info,sizeof (*he->branch_info));
@@ -419,21 +416,8 @@ static int hist_entry__init(struct hist_entry *he,if (he->raw_data) { he->raw_data =memdup (he->raw_data, he->raw_size); - -if (he->raw_data ==NULL ) { -map__put (he->ms.map); -if (he->branch_info) { -map__put (he->branch_info->from.map); -map__put (he->branch_info->to.map); -free (he->branch_info); - } -if (he->mem_info) { -map__put (he->mem_info->iaddr.map); -map__put (he->mem_info->daddr.map); - } -free (he->stat_acc); -return -ENOMEM ; - } +if (he->raw_data ==NULL ) + goto err_infos; }INIT_LIST_HEAD (&he->pairs.node);thread__get (he->thread);
@@ -444,6 +428,21 @@ static int hist_entry__init(struct hist_entry *he, he->leaf = true;return 0 ; + +err_infos: +if (he->branch_info) { +map__put (he->branch_info->from.map); +map__put (he->branch_info->to.map); +free (he->branch_info); + } +if (he->mem_info) { +map__put (he->mem_info->iaddr.map); +map__put (he->mem_info->daddr.map); + } +err: +map__zput (he->ms.map); +free (he->stat_acc); +return -ENOMEM ; }static void *hist_entry__zalloc (size_t size)
Signature · 1 line
2.17.2
Jiri Olsa
reviewerPATCH 2/2 perf hist: Fix memory leak of srcline
From: Jiri Olsa <[email protected]>
We can't allocate he->srcline unconditionaly, only when new hist_entry is created. Moving he->srcline allocation into hist_entry__init function.
Original-patch-by Jonas Rabenstein <[email protected]>
Suggested-by Namhyung Kim <[email protected]>
Signed-off-by Jiri Olsa <[email protected]>
--- tools/perf/util/hist.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
tools/perf/util/hist.c +12 -2
@@ -419,6 +419,13 @@ static int hist_entry__init(struct hist_entry *he,if (he->raw_data ==NULL ) goto err_infos; } + +if (he->srcline) { + he->srcline =strdup (he->srcline); +if (he->srcline ==NULL ) + goto err_rawdata; + } +INIT_LIST_HEAD (&he->pairs.node);thread__get (he->thread); he->hroot_in =RB_ROOT_CACHED ;
@@ -429,6 +436,9 @@ static int hist_entry__init(struct hist_entry *he,return 0 ; +err_rawdata: +free (he->raw_data); + err_infos:if (he->branch_info) {map__put (he->branch_info->from.map);
@@ -605,7 +615,7 @@ __hists__add_entry(struct hists *hists, .map = al->map, .sym = al->sym, }, - .srcline = al->srcline ? strdup(al->srcline) : NULL, + .srcline = (char *) al->srcline, .socket = al->socket, .cpu = al->cpu, .cpumode = al->cpumode,
@@ -962,7 +972,7 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter, .map = al->map, .sym = al->sym, }, - .srcline = al->srcline ? strdup(al->srcline) : NULL, + .srcline = (char *) al->srcline, .parent = iter->parent, .raw_data = sample->raw_data, .raw_size = sample->raw_size,
Signature · 1 line
2.17.2