From: Slavomir Kaslev <kaslevs@vmware.com>
To: Tzvetomir Stoyanov <tstoyanov@vmware.com>
Cc: rostedt@goodmis.org, linux-trace-devel@vger.kernel.org
Subject: Re: [PATCH v4 1/7] trace-cmd: Implemented new lib API: tracecmd_local_events_system()
Date: Fri, 22 Feb 2019 17:51:04 +0200 [thread overview]
Message-ID: <20190222155100.GA14440@box> (raw)
In-Reply-To: <20190222142836.12596-2-tstoyanov@vmware.com>
On Fri, Feb 22, 2019 at 04:28:30PM +0200, Tzvetomir Stoyanov wrote:
> The new tracecmd lib API tracecmd_local_events_system() creates
> a tep handler and initializes it with the events of the
> specified subsystems.
>
> Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
> ---
> include/trace-cmd/trace-cmd.h | 2 +
> lib/trace-cmd/trace-util.c | 99 +++++++++++++++++++++++------------
> 2 files changed, 68 insertions(+), 33 deletions(-)
>
> diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h
> index 27ba89d..0067882 100644
> --- a/include/trace-cmd/trace-cmd.h
> +++ b/include/trace-cmd/trace-cmd.h
> @@ -32,6 +32,8 @@ void tracecmd_unload_plugins(struct tep_plugin_list *list, struct tep_handle *pe
> char **tracecmd_event_systems(const char *tracing_dir);
> char **tracecmd_system_events(const char *tracing_dir, const char *system);
> struct tep_handle *tracecmd_local_events(const char *tracing_dir);
> +struct tep_handle *tracecmd_local_events_system(const char *tracing_dir,
> + char **sys_names);
Can we have sys_names be `const char **` to imply that it's not getting modified
in here?
> int tracecmd_fill_local_events(const char *tracing_dir, struct tep_handle *pevent);
> char **tracecmd_local_plugins(const char *tracing_dir);
>
> diff --git a/lib/trace-cmd/trace-util.c b/lib/trace-cmd/trace-util.c
> index b5aea39..0e925ed 100644
> --- a/lib/trace-cmd/trace-util.c
> +++ b/lib/trace-cmd/trace-util.c
> @@ -1119,43 +1119,15 @@ static int read_header(struct tep_handle *pevent, const char *events_dir)
> return ret;
> }
>
> -/**
> - * tracecmd_local_events - create a pevent from the events on system
> - * @tracing_dir: The directory that contains the events.
> - *
> - * Returns a pevent structure that contains the pevents local to
> - * the system.
> - */
> -struct tep_handle *tracecmd_local_events(const char *tracing_dir)
> -{
> - struct tep_handle *pevent = NULL;
> -
> - pevent = tep_alloc();
> - if (!pevent)
> - return NULL;
> -
> - if (tracecmd_fill_local_events(tracing_dir, pevent)) {
> - tep_free(pevent);
> - pevent = NULL;
> - }
> -
> - return pevent;
> -}
> -
> -/**
> - * tracecmd_fill_local_events - Fill a pevent with the events on system
> - * @tracing_dir: The directory that contains the events.
> - * @pevent: Allocated pevent which will be filled
> - *
> - * Returns whether the operation succeeded
> - */
> -int tracecmd_fill_local_events(const char *tracing_dir, struct tep_handle *pevent)
> +static int tracecmd_fill_local_events_system(const char *tracing_dir,
> + struct tep_handle *pevent,
> + char **sys_names)
> {
> + int ret, i, failure = 0;
> struct dirent *dent;
> char *events_dir;
> struct stat st;
> DIR *dir;
> - int ret, failure = 0;
>
> if (!tracing_dir)
> return -1;
> @@ -1189,7 +1161,16 @@ int tracecmd_fill_local_events(const char *tracing_dir, struct tep_handle *peven
> if (strcmp(name, ".") == 0 ||
> strcmp(name, "..") == 0)
> continue;
> -
> + if (sys_names) {
> + i = 0;
> + while (sys_names[i]) {
> + if (strcmp(name, sys_names[i]) == 0)
> + break;
> + i++;
> + }
> + if (sys_names[i] == NULL)
> + continue;
> + }
I think this would be better done in a separate function, say:
static bool contains(const char *name, const char **names)
{
while (*names) {
if (strcmp(name, *names++) == 0)
return true;
}
return false;
}
and then simply have
if (sys_names && !contains(name, sys_names))
continue;
here.
> sys = append_file(events_dir, name);
> ret = stat(sys, &st);
> if (ret < 0 || !S_ISDIR(st.st_mode)) {
> @@ -1217,6 +1198,58 @@ int tracecmd_fill_local_events(const char *tracing_dir, struct tep_handle *peven
> return ret;
> }
>
> +/**
> + * tracecmd_local_events_system - create a tep from the events of the specified subsystem.
> + *
> + * @tracing_dir: The directory that contains the events.
> + * @sys_name: Array of system names, to load the events from.
> + * The last element from the array must be NULL
> + *
> + * Returns a tep structure that contains the tep local to
> + * the system.
> + */
> +struct tep_handle *tracecmd_local_events_system(const char *tracing_dir,
> + char **sys_names)
> +{
> + struct tep_handle *tep = NULL;
> +
> + tep = tep_alloc();
> + if (!tep)
> + return NULL;
> +
> + if (tracecmd_fill_local_events_system(tracing_dir, tep, sys_names)) {
> + tep_free(tep);
> + tep = NULL;
> + }
> +
> + return tep;
> +}
> +
> +/**
> + * tracecmd_local_events - create a pevent from the events on system
> + * @tracing_dir: The directory that contains the events.
> + *
> + * Returns a pevent structure that contains the pevents local to
> + * the system.
> + */
> +struct tep_handle *tracecmd_local_events(const char *tracing_dir)
> +{
> + return tracecmd_local_events_system(tracing_dir, NULL);
> +}
> +
> +/**
> + * tracecmd_fill_local_events - Fill a pevent with the events on system
> + * @tracing_dir: The directory that contains the events.
> + * @pevent: Allocated pevent which will be filled
> + *
> + * Returns whether the operation succeeded
> + */
> +int tracecmd_fill_local_events(const char *tracing_dir,
> + struct tep_handle *pevent)
> +{
> + return tracecmd_fill_local_events_system(tracing_dir, pevent, NULL);
> +}
> +
> /**
> * tracecmd_local_plugins - returns an array of available tracer plugins
> * @tracing_dir: The directory that contains the tracing directory
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-02-22 15:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-22 14:28 [PATCH v4 0/7][POC] trace-cmd: Timetamps sync between host and guest machines, relying on vsock events Tzvetomir Stoyanov
2019-02-22 14:28 ` [PATCH v4 1/7] trace-cmd: Implemented new lib API: tracecmd_local_events_system() Tzvetomir Stoyanov
2019-02-22 15:51 ` Slavomir Kaslev [this message]
2019-02-22 19:22 ` Steven Rostedt
2019-02-22 14:28 ` [PATCH v4 2/7] trace-cmd: Added support for negative time offsets in trace.dat file Tzvetomir Stoyanov
2019-02-22 14:28 ` [PATCH v4 3/7] trace-cmd: Fix tracecmd_read_page_record() to read more than one event Tzvetomir Stoyanov
2019-02-22 16:09 ` Slavomir Kaslev
2019-02-22 14:28 ` [PATCH v4 4/7] trace-cmd: Added implementation of htonll() and ntohll() Tzvetomir Stoyanov
2019-02-22 14:28 ` [PATCH v4 5/7] trace-cmd: Refactored make_instances() and tracecmd_remove_instances() Tzvetomir Stoyanov
2019-02-22 14:28 ` [PATCH v4 6/7] trace-cmd: Find and store pids of tasks, which run virtual CPUs of given VM Tzvetomir Stoyanov
2019-02-22 17:07 ` Slavomir Kaslev
2019-02-22 19:25 ` Steven Rostedt
2019-02-22 14:28 ` [PATCH v4 7/7] trace-cmd [POC]: Implemented timestamps synch algorithm, using vsock events Tzvetomir Stoyanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190222155100.GA14440@box \
--to=kaslevs@vmware.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tstoyanov@vmware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).