From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Renninger Subject: [PATCH 8/8] perf: timechart: Fix memleak Date: Thu, 2 Dec 2010 17:42:28 +0100 Message-ID: <1291308148-28628-9-git-send-email-trenn@suse.de> References: <1291308148-28628-1-git-send-email-trenn@suse.de> <1291308148-28628-2-git-send-email-trenn@suse.de> <1291308148-28628-3-git-send-email-trenn@suse.de> <1291308148-28628-4-git-send-email-trenn@suse.de> <1291308148-28628-5-git-send-email-trenn@suse.de> <1291308148-28628-6-git-send-email-trenn@suse.de> <1291308148-28628-7-git-send-email-trenn@suse.de> <1291308148-28628-8-git-send-email-trenn@suse.de> Return-path: In-Reply-To: <1291308148-28628-8-git-send-email-trenn@suse.de> Sender: linux-kernel-owner@vger.kernel.org Cc: Thomas Renninger , Arjan van de Ven , Ingo Molnar , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-perf-users.vger.kernel.org There are others, but these are not worth it, e.g. built up power event list which gets destroyed on program exit anyway or some bytes when trace events get parsed. This one showed by far the biggest memory waste, was easy to fix and could help when parsing huge trace event records. Signed-off-by: Thomas Renninger CC: Arjan van de Ven CC: Ingo Molnar CC: linux-perf-users@vger.kernel.org CC: linux-kernel@vger.kernel.org Found with valgrind, fixes: ==43509== 1,402 bytes in 251 blocks are definitely lost in loss record 61 of 74 ==43509== at 0x4C261D7: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==43509== by 0x61573B1: strdup (in /lib64/libc-2.11.1.so) ==43509== by 0x41DD3D: draw_wakeups (builtin-timechart.c:706) ==43509== by 0x41E7C9: write_svg_file (builtin-timechart.c:957) ==43509== by 0x41E87E: __cmd_timechart (builtin-timechart.c:989) ==43509== by 0x41EB3C: cmd_timechart (builtin-timechart.c:1097) ==43509== by 0x40D776: run_builtin (perf.c:286) ==43509== by 0x40D993: handle_internal_command (perf.c:357) ==43509== by 0x40DAD2: run_argv (perf.c:401) ==43509== by 0x40DCB3: main (perf.c:487) ==43509== ==43509== 2,826 bytes in 429 blocks are definitely lost in loss record 63 of 74 ==43509== at 0x4C261D7: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==43509== by 0x61573B1: strdup (in /lib64/libc-2.11.1.so) ==43509== by 0x41DD70: draw_wakeups (builtin-timechart.c:710) ==43509== by 0x41E7C9: write_svg_file (builtin-timechart.c:957) ==43509== by 0x41E87E: __cmd_timechart (builtin-timechart.c:989) ==43509== by 0x41EB3C: cmd_timechart (builtin-timechart.c:1097) ==43509== by 0x40D776: run_builtin (perf.c:286) ==43509== by 0x40D993: handle_internal_command (perf.c:357) ==43509== by 0x40DAD2: run_argv (perf.c:401) ==43509== by 0x40DCB3: main (perf.c:487) --- tools/perf/builtin-timechart.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c index 391e475..c6e0a00 100644 --- a/tools/perf/builtin-timechart.c +++ b/tools/perf/builtin-timechart.c @@ -715,10 +715,14 @@ static void draw_wakeups(void) if (c->Y && c->start_time <= we->time && c->end_time >= we->time) { if (p->pid == we->waker && !from) { from = c->Y; + if (task_from) + free(task_from); task_from = strdup(c->comm); } if (p->pid == we->wakee && !to) { to = c->Y; + if (task_to) + free(task_to); task_to = strdup(c->comm); } } @@ -728,10 +732,14 @@ static void draw_wakeups(void) while (c) { if (p->pid == we->waker && !from) { from = c->Y; + if (task_from) + free(task_from); task_from = strdup(c->comm); } if (p->pid == we->wakee && !to) { to = c->Y; + if (task_to) + free(task_to); task_to = strdup(c->comm); } c = c->next; -- 1.6.0.2