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 X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE9B6C433ED for ; Fri, 23 Apr 2021 00:17:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B683C613DE for ; Fri, 23 Apr 2021 00:17:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235691AbhDWASZ (ORCPT ); Thu, 22 Apr 2021 20:18:25 -0400 Received: from 7.mo1.mail-out.ovh.net ([87.98.158.110]:42945 "EHLO 7.mo1.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235302AbhDWASZ (ORCPT ); Thu, 22 Apr 2021 20:18:25 -0400 X-Greylist: delayed 10801 seconds by postgrey-1.27 at vger.kernel.org; Thu, 22 Apr 2021 20:18:25 EDT Received: from player770.ha.ovh.net (unknown [10.110.171.212]) by mo1.mail-out.ovh.net (Postfix) with ESMTP id 9B2CC201580 for ; Thu, 22 Apr 2021 22:42:16 +0200 (CEST) Received: from sterchelen.net (lfbn-cae-1-333-239.w90-22.abo.wanadoo.fr [90.22.52.239]) (Authenticated sender: nicolas@sterchelen.net) by player770.ha.ovh.net (Postfix) with ESMTPSA id 257731D7DD260; Thu, 22 Apr 2021 20:42:15 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-96R00125489619-16ba-441a-b8be-47bc5ca6b879, E1ABC221D09B5BF3267ED4C522E93FD7817BC244) smtp.auth=nicolas@sterchelen.net X-OVh-ClientIp: 90.22.52.239 Date: Thu, 22 Apr 2021 22:41:54 +0200 From: Nicolas Sterchele To: Steven Rostedt Cc: Linux Trace Devel Subject: Re: [PATCH] trace-cmd list: Add --full to show print fmt of an event Message-ID: References: <20210416141720.57a7963d@gandalf.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20210416141720.57a7963d@gandalf.local.home> X-Ovh-Tracer-Id: 16116131267624995597 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduledrvddutddgudehvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomheppfhitgholhgrshcuufhtvghrtghhvghlvgcuoehnihgtohhlrghssehsthgvrhgthhgvlhgvnhdrnhgvtheqnecuggftrfgrthhtvghrnhepgeejvdffgfdvfeekiefhjeelgefhieduvdeguefhveeigedvvdejleetgeefkeeknecukfhppedtrddtrddtrddtpdeltddrvddvrdehvddrvdefleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphdqohhuthdphhgvlhhopehplhgrhigvrhejjedtrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepnhhitgholhgrshesshhtvghrtghhvghlvghnrdhnvghtpdhrtghpthhtoheplhhinhhugidqthhrrggtvgdquggvvhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrgh Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org On 2021-04-16 14:17, Steven Rostedt wrote: >From: "Steven Rostedt (VMware)" > >There's several times I want to see the print fmt from the event's format >file, and there's no way to do that with trace-cmd list -e. Add a --full >option to display the entire format file of an event, including the print >fmt, which can be useful as well. > >Signed-off-by: Steven Rostedt (VMware) >--- > Documentation/trace-cmd/trace-cmd-list.1.txt | 5 ++- > tracecmd/trace-list.c | 39 ++++++++++++-------- > tracecmd/trace-usage.c | 1 + > 3 files changed, 28 insertions(+), 17 deletions(-) > >diff --git a/Documentation/trace-cmd/trace-cmd-list.1.txt b/Documentation/trace-cmd/trace-cmd-list.1.txt >index 0ad62643..a5c6b16c 100644 >--- a/Documentation/trace-cmd/trace-cmd-list.1.txt >+++ b/Documentation/trace-cmd/trace-cmd-list.1.txt >@@ -26,7 +26,10 @@ OPTIONS > trace-cmd list -e '^sys.*' > > *-F*:: >- Used with *-e* 'regex' to show those events formats. >+ Used with *-e* 'regex' to show the fields of the event. >+ >+*--full*:: >+ Used with *-F* which will show the "print fmt" of the event along with the fields. > > *-l*:: > Used with *-e* 'regex' to show those events filters. >diff --git a/tracecmd/trace-list.c b/tracecmd/trace-list.c >index 4615b322..e292664e 100644 >--- a/tracecmd/trace-list.c >+++ b/tracecmd/trace-list.c >@@ -44,6 +44,7 @@ enum { > SHOW_EVENT_FORMAT = 1 << 0, > SHOW_EVENT_FILTER = 1 << 1, > SHOW_EVENT_TRIGGER = 1 << 2, >+ SHOW_EVENT_FULL = 1 << 3, > }; > > >@@ -56,10 +57,10 @@ void show_file(const char *name) > tracefs_put_tracing_file(path); > } > >-typedef int (*process_file_func)(char *buf, int len); >+typedef int (*process_file_func)(char *buf, int len, int flags); > > static void process_file_re(process_file_func func, >- const char *name, const char *re) >+ const char *name, const char *re, int flags) > { > regex_t reg; > char *path; >@@ -84,7 +85,7 @@ static void process_file_re(process_file_func func, > strcpy(&str[l-1], "\n*$"); > > if (regcomp(®, str, REG_ICASE|REG_NOSUB)) >- die("invalid function regex '%s'", re); >+ die("invalid function regex '%s'", re, flags); Shouldn't we add `flags` inside the fmt string?: die("invalid function regex '%s' with '%d' as flags", re, flags); > free(str); > >@@ -97,7 +98,7 @@ static void process_file_re(process_file_func func, > do { > n = getline(&buf, &l, fp); > if (n > 0 && regexec(®, buf, 0, NULL, 0) == 0) >- func(buf, n); >+ func(buf, n, flags); > } while (n > 0); > free(buf); > fclose(fp); >@@ -105,14 +106,14 @@ static void process_file_re(process_file_func func, > regfree(®); > } > >-static int show_file_write(char *buf, int len) >+static int show_file_write(char *buf, int len, int flags) > { > return fwrite(buf, 1, len, stdout); > } > > static void show_file_re(const char *name, const char *re) > { >- process_file_re(show_file_write, name, re); >+ process_file_re(show_file_write, name, re, 0); > } > > static char *get_event_file(const char *type, char *buf, int len) >@@ -144,7 +145,7 @@ static char *get_event_file(const char *type, char *buf, int len) > return file; > } > >-static int event_filter_write(char *buf, int len) >+static int event_filter_write(char *buf, int len, int flags) > { > char *file; > >@@ -161,7 +162,7 @@ static int event_filter_write(char *buf, int len) > return 0; > } > >-static int event_trigger_write(char *buf, int len) >+static int event_trigger_write(char *buf, int len, int flags) > { > char *file; > >@@ -178,14 +179,17 @@ static int event_trigger_write(char *buf, int len) > return 0; > } > >-static int event_format_write(char *fbuf, int len) >+static int event_format_write(char *fbuf, int len, int flags) > { > char *file = get_event_file("format", fbuf, len); > char *buf = NULL; > size_t l; > FILE *fp; >+ bool full; > int n; > >+ full = flags & SHOW_EVENT_FULL; >+ > /* The get_event_file() crops system in fbuf */ > printf("system: %s\n", fbuf); > >@@ -198,7 +202,7 @@ static int event_format_write(char *fbuf, int len) > do { > n = getline(&buf, &l, fp); > if (n > 0) { >- if (strncmp(buf, "print fmt", 9) == 0) >+ if (!full && strncmp(buf, "print fmt", 9) == 0) > break; > fwrite(buf, 1, n, stdout); > } >@@ -213,19 +217,19 @@ static int event_format_write(char *fbuf, int len) > > static void show_event_filter_re(const char *re) > { >- process_file_re(event_filter_write, "available_events", re); >+ process_file_re(event_filter_write, "available_events", re, 0); > } > > > static void show_event_trigger_re(const char *re) > { >- process_file_re(event_trigger_write, "available_events", re); >+ process_file_re(event_trigger_write, "available_events", re, 0); > } > > >-static void show_event_format_re(const char *re) >+static void show_event_format_re(const char *re, int flags) > { >- process_file_re(event_format_write, "available_events", re); >+ process_file_re(event_format_write, "available_events", re, flags); > } > > >@@ -236,7 +240,7 @@ static void show_events(const char *eventre, int flags) > > if (eventre) { > if (flags & SHOW_EVENT_FORMAT) >- show_event_format_re(eventre); >+ show_event_format_re(eventre, flags); > > else if (flags & SHOW_EVENT_FILTER) > show_event_filter_re(eventre); >@@ -453,7 +457,6 @@ static void show_plugins(void) > tep_free(pevent); > } > >- > void trace_list(int argc, char **argv) > { > int events = 0; >@@ -536,6 +539,10 @@ void trace_list(int argc, char **argv) > tracecmd_set_debug(true); > break; > } >+ if (strcmp(argv[i], "--full") == 0) { >+ flags |= SHOW_EVENT_FULL; >+ break; >+ } > fprintf(stderr, "list: invalid option -- '%s'\n", > argv[i]); > default: >diff --git a/tracecmd/trace-usage.c b/tracecmd/trace-usage.c >index 3faa287b..567a91cb 100644 >--- a/tracecmd/trace-usage.c >+++ b/tracecmd/trace-usage.c >@@ -322,6 +322,7 @@ static struct usage_help usage_help[] = { > " %s list [-e [regex]][-t][-o][-f [regex]]\n" > " -e list available events\n" > " -F show event format\n" >+ " --full show the print fmt with -F\n" > " -R show event triggers\n" > " -l show event filters\n" > " -t list available tracers\n" >-- >2.29.2 > --- Nicolas Sterchele