From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4FA86C433F5 for ; Fri, 27 May 2022 10:51:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B46E610EF4E; Fri, 27 May 2022 10:50:58 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1B76310EF4E; Fri, 27 May 2022 10:50:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1653648654; x=1685184654; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FSiKACiRGQtkHjcw1RluOzxMa/YKxVziVMudDTg5gec=; b=QgP5Dtc1dyshoAie5BhjDDAGZ8c159AfMGHZ3yEs8AbqWY7VGP1uKCdL hcjidS/e57ayjMBmROCT9wAe2Dowh29RpnUjY6gOb3gqwLjh55fP9U8Te 9UwN3ed9ixEfk3PU42yZYGjnyEwis/9c8WbUo3xYRjFOiAHKNdMzb2vU3 MRVom+gRnM19g7efumPKYSvrC/KTcpHUY6hOS6Tbm2zQEhBXd0k6mdpHI B0L+ZkU0ILNnx7TT5+xXkbxHaNc475mE3jXhHtbrBjq0MNlrCJiC9VKYz HUR5t66BT6S/O9WvvFzA/R05HiGtZZYdL2qmoz+o+ltkLtJTCPtQOn/A3 w==; X-IronPort-AV: E=McAfee;i="6400,9594,10359"; a="262066139" X-IronPort-AV: E=Sophos;i="5.91,255,1647327600"; d="scan'208";a="262066139" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2022 03:50:53 -0700 X-IronPort-AV: E=Sophos;i="5.91,255,1647327600"; d="scan'208";a="550155699" Received: from dnanduri-mobl.ger.corp.intel.com (HELO tursulin-mobl2.home) ([10.213.215.174]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2022 03:50:52 -0700 From: Tvrtko Ursulin To: igt-dev@lists.freedesktop.org Date: Fri, 27 May 2022 11:50:42 +0100 Message-Id: <20220527105042.2233128-3-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220527105042.2233128-1-tvrtko.ursulin@linux.intel.com> References: <20220527105042.2233128-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Intel-gfx] [PATCH i-g-t 3/3] intel_gpu_top: Free all memory on exit X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Tvrtko Ursulin Be nice and explicitly free all memory on exit. Also fix a Valgrind reported unitilised conditional jump. Signed-off-by: Tvrtko Ursulin Cc: Petri Latvala --- tools/intel_gpu_top.c | 51 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c index 26986a822bb7..997aff582ff7 100644 --- a/tools/intel_gpu_top.c +++ b/tools/intel_gpu_top.c @@ -437,6 +437,36 @@ static struct engines *discover_engines(char *device) return engines; } +static void free_engines(struct engines *engines) +{ + struct pmu_counter **pmu, *free_list[] = { + &engines->r_gpu, + &engines->r_pkg, + &engines->imc_reads, + &engines->imc_writes, + NULL + }; + unsigned int i; + + for (pmu = &free_list[0]; *pmu; pmu++) { + if ((*pmu)->present) + free((char *)(*pmu)->units); + } + + for (i = 0; i < engines->num_engines; i++) { + struct engine *engine = engine_ptr(engines, i); + + free((char *)engine->name); + free((char *)engine->short_name); + free((char *)engine->display_name); + } + + closedir(engines->root); + + free(engines->class); + free(engines); +} + #define _open_pmu(type, cnt, pmu, fd) \ ({ \ int fd__; \ @@ -1073,7 +1103,7 @@ static size_t freadat2buf(char *buf, const size_t sz, DIR *at, const char *name) return count; } -static struct clients *scan_clients(struct clients *clients) +static struct clients *scan_clients(struct clients *clients, bool display) { struct dirent *proc_dent; struct client *c; @@ -1181,7 +1211,7 @@ next: break; } - return display_clients(clients); + return display ? display_clients(clients) : clients; } static const char *bars[] = { " ", "▏", "▎", "▍", "▌", "▋", "▊", "▉", "█" }; @@ -2391,7 +2421,7 @@ static void process_stdin(unsigned int timeout_us) static bool has_drm_fdinfo(const struct igt_device_card *card) { - struct drm_client_fdinfo info; + struct drm_client_fdinfo info = { }; unsigned int cnt; int fd; @@ -2572,7 +2602,7 @@ int main(int argc, char **argv) } pmu_sample(engines); - scan_clients(clients); + scan_clients(clients, false); codename = igt_device_get_pretty_name(&card, false); while (!stop_top) { @@ -2599,7 +2629,7 @@ int main(int argc, char **argv) pmu_sample(engines); t = (double)(engines->ts.cur - engines->ts.prev) / 1e9; - disp_clients = scan_clients(clients); + disp_clients = scan_clients(clients, true); if (stop_top) break; @@ -2649,21 +2679,24 @@ int main(int argc, char **argv) pops->close_struct(); } - if (stop_top) - break; - if (disp_clients != clients) free_clients(disp_clients); + if (stop_top) + break; + if (output_mode == INTERACTIVE) process_stdin(period_us); else usleep(period_us); } + if (clients) + free_clients(clients); + free(codename); err: - free(engines); + free_engines(engines); free(pmu_device); exit: igt_devices_free(); -- 2.32.0