From nobody Mon Apr 13 17:13:21 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6109BC4332F for ; Mon, 14 Nov 2022 18:15:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237542AbiKNSPC (ORCPT ); Mon, 14 Nov 2022 13:15:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238309AbiKNSOR (ORCPT ); Mon, 14 Nov 2022 13:14:17 -0500 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B06642CE26 for ; Mon, 14 Nov 2022 10:14:03 -0800 (PST) Received: by mail-pg1-x54a.google.com with SMTP id h19-20020a63e153000000b00434dfee8dbaso6177723pgk.18 for ; Mon, 14 Nov 2022 10:14:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=HIf5Y9gptGCDfzfHbnNjnA19mp6qRpBDngBttcXhem0=; b=ms3hkkK95AjV+ioKEVEzkclXhnmqtE13D4LhndsjTMdIUDHQQXNB8UOSp2+OFTFRFK ViC7tHBGKBTJNv7KryjTbINFQI5fSv39fXjaAD5iZypgA1bxtBjBkHjH2M85yh6ALa2h 1r1lslPr4brLR45T0lMkmoq02U6kvVZouc8YCevM+z0aijHfPQjqgUTaoPOiWwSwRN9c 89CwAlZ0BJ7onnoeLlDSwM5RNnDzvUBjgPlZTeANeCa6chbAE3MnVd+zdOGqb3wd27t1 N9EDnlvusDE3+Mge/bfb7XJjnpg5n905IcTGtJ2BUzKJFtPCYmXEhsLg0SgWUwtRxGB7 /p3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HIf5Y9gptGCDfzfHbnNjnA19mp6qRpBDngBttcXhem0=; b=GNmLFJTFoP1skRE50L5cBSh8ilVrKPjft7Ysz6MddfyYAEhO5h1YtHWSyA7aQV2pYK XGKPvs4waoC4b7CeikXeApOfqwr3zZlQ552wVn0KntNaHxNeTykldlZ/fVnXyrySDmXc 21JxfRVdedY1zfq5l/fIKD+6gU6oJXD9UYiiXPPO/opcBJF/nK3R5ug0cWKrg9XMgNLD MOu77wdeH/RhiM1f7C5uu5ouvfQUvONjS7yj1nCdc4ZXAV+56lALwf6a+LlTUmBs4kL1 3aKfOcPlotRje2jd1DRZsBF2ds09Uq7RT4+LVX0HRHm1Mb/UGAFAUgGgsFzmX5WXbx3t LLDg== X-Gm-Message-State: ANoB5pkH6kv+9F1Jr1L8wLF0eX9EB4bpj9ZJDwOTWyVMqDIXn/0IPIP5 /V8WoaNgWVEW81INJAeBHMlG4POWacAu X-Google-Smtp-Source: AA0mqf7fo8BRpt9UyNarIFwRiFpN3L3+Rg+07DS6Qqp0WgP/FT8AsgvT1iH5tLFIF2XStyDqjYS6g+TWGWsG X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:553:438f:b86a:87f]) (user=irogers job=sendgmr) by 2002:a62:b402:0:b0:56e:8f96:6b2e with SMTP id h2-20020a62b402000000b0056e8f966b2emr14862845pfn.18.1668449643208; Mon, 14 Nov 2022 10:14:03 -0800 (PST) Date: Mon, 14 Nov 2022 10:12:48 -0800 In-Reply-To: <20221114181251.2683871-1-irogers@google.com> Message-Id: <20221114181251.2683871-7-irogers@google.com> Mime-Version: 1.0 References: <20221114181251.2683871-1-irogers@google.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Subject: [PATCH v2 6/9] perf list: Simplify symbol event printing From: Ian Rogers To: Weilin Wang , Perry Taylor , Caleb Biggers , Leo Yan , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Sandipan Das , Kajol Jain , Zhengjun Xing , Kan Liang , Ravi Bangoria , Xin Gao , Rob Herring , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The current code computes an array of symbol names then sorts and prints them. Use a strlist to create a list of names that is sorted and then print it. Signed-off-by: Ian Rogers --- tools/perf/util/print-events.c | 79 +++++++++------------------------- 1 file changed, 21 insertions(+), 58 deletions(-) diff --git a/tools/perf/util/print-events.c b/tools/perf/util/print-events.c index ff7793944246..d53dba033597 100644 --- a/tools/perf/util/print-events.c +++ b/tools/perf/util/print-events.c @@ -52,14 +52,6 @@ static const struct event_symbol event_symbols_tool[PERF= _TOOL_MAX] =3D { }, }; =20 -static int cmp_string(const void *a, const void *b) -{ - const char * const *as =3D a; - const char * const *bs =3D b; - - return strcmp(*as, *bs); -} - /* * Print the events from /tracing/events */ @@ -298,77 +290,48 @@ void print_symbol_events(const char *event_glob, unsi= gned int type, struct event_symbol *syms, unsigned int max, bool name_only) { - unsigned int i, evt_i =3D 0, evt_num =3D 0; - char name[MAX_NAME_LEN]; - char **evt_list =3D NULL; - bool evt_num_known =3D false; - -restart: - if (evt_num_known) { - evt_list =3D zalloc(sizeof(char *) * evt_num); - if (!evt_list) - goto out_enomem; - syms -=3D max; - } + struct strlist *evt_name_list =3D strlist__new(NULL, NULL); + struct str_node *nd; =20 - for (i =3D 0; i < max; i++, syms++) { + if (!evt_name_list) { + pr_debug("Failed to allocate new strlist for symbol events\n"); + return; + } + for (unsigned int i =3D 0; i < max; i++) { /* * New attr.config still not supported here, the latest * example was PERF_COUNT_SW_CGROUP_SWITCHES */ - if (syms->symbol =3D=3D NULL) + if (syms[i].symbol =3D=3D NULL) continue; =20 - if (event_glob !=3D NULL && !(strglobmatch(syms->symbol, event_glob) || - (syms->alias && strglobmatch(syms->alias, event_glob)))) + if (event_glob !=3D NULL && !(strglobmatch(syms[i].symbol, event_glob) || + (syms[i].alias && strglobmatch(syms[i].alias, event_glob)))) continue; =20 if (!is_event_supported(type, i)) continue; =20 - if (!evt_num_known) { - evt_num++; - continue; - } - - if (!name_only && strlen(syms->alias)) - snprintf(name, MAX_NAME_LEN, "%s OR %s", syms->symbol, syms->alias); - else - strlcpy(name, syms->symbol, MAX_NAME_LEN); + if (strlen(syms[i].alias)) { + char name[MAX_NAME_LEN]; =20 - evt_list[evt_i] =3D strdup(name); - if (evt_list[evt_i] =3D=3D NULL) - goto out_enomem; - evt_i++; + snprintf(name, MAX_NAME_LEN, "%s OR %s", syms[i].symbol, syms[i].alias); + strlist__add(evt_name_list, name); + } else + strlist__add(evt_name_list, syms[i].symbol); } =20 - if (!evt_num_known) { - evt_num_known =3D true; - goto restart; - } - qsort(evt_list, evt_num, sizeof(char *), cmp_string); - evt_i =3D 0; - while (evt_i < evt_num) { + strlist__for_each_entry(nd, evt_name_list) { if (name_only) { - printf("%s ", evt_list[evt_i++]); + printf("%s ", nd->s); continue; } - printf(" %-50s [%s]\n", evt_list[evt_i++], event_type_descriptors[type]= ); + printf(" %-50s [%s]\n", nd->s, event_type_descriptors[type]); } - if (evt_num && pager_in_use()) + if (!strlist__empty(evt_name_list) && pager_in_use()) printf("\n"); =20 -out_free: - evt_num =3D evt_i; - for (evt_i =3D 0; evt_i < evt_num; evt_i++) - zfree(&evt_list[evt_i]); - zfree(&evt_list); - return; - -out_enomem: - printf("FATAL: not enough memory to print %s\n", event_type_descriptors[t= ype]); - if (evt_list) - goto out_free; + strlist__delete(evt_name_list); } =20 /* --=20 2.38.1.431.g37b22c650d-goog