From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH 1/2] trace-cmd: Add new tracefs API tracefs_instances_walk()
Date: Fri, 17 Jul 2020 11:03:25 +0300 [thread overview]
Message-ID: <20200717080326.82151-2-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20200717080326.82151-1-tz.stoyanov@gmail.com>
The logic for finding all configured ftrace instances is encapuslated in
the new tracefs_instances_walk() API. A user specified callback is
called for each ftrace instance in the system, excpet for the top level
one.
The implementation of "trace-cmd stat" is modified to use the new API.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
include/tracefs/tracefs.h | 1 +
lib/tracefs/include/tracefs-local.h | 1 +
lib/tracefs/tracefs-events.c | 14 ++++----
lib/tracefs/tracefs-instance.c | 52 +++++++++++++++++++++++++++++
tracecmd/trace-stat.c | 52 ++++++++---------------------
5 files changed, 74 insertions(+), 46 deletions(-)
diff --git a/include/tracefs/tracefs.h b/include/tracefs/tracefs.h
index 8ee7ba6e..0dd8046f 100644
--- a/include/tracefs/tracefs.h
+++ b/include/tracefs/tracefs.h
@@ -32,6 +32,7 @@ int tracefs_instance_file_write(struct tracefs_instance *instance,
const char *file, const char *str);
char *tracefs_instance_file_read(struct tracefs_instance *instance,
char *file, int *psize);
+int tracefs_instances_walk(int (*callback)(const char *, void *), void *context);
bool tracefs_file_exists(struct tracefs_instance *instance, char *name);
bool tracefs_dir_exists(struct tracefs_instance *instance, char *name);
diff --git a/lib/tracefs/include/tracefs-local.h b/lib/tracefs/include/tracefs-local.h
index fe327a0f..08b67fa9 100644
--- a/lib/tracefs/include/tracefs-local.h
+++ b/lib/tracefs/include/tracefs-local.h
@@ -9,5 +9,6 @@
/* Can be overridden */
void warning(const char *fmt, ...);
int str_read_file(const char *file, char **buffer);
+char *trace_append_file(const char *dir, const char *name);
#endif /* _TRACE_FS_LOCAL_H */
diff --git a/lib/tracefs/tracefs-events.c b/lib/tracefs/tracefs-events.c
index 8e825f50..564a5ab2 100644
--- a/lib/tracefs/tracefs-events.c
+++ b/lib/tracefs/tracefs-events.c
@@ -210,7 +210,7 @@ static char **add_list_string(char **list, const char *name, int len)
return list;
}
-static char *append_file(const char *dir, const char *name)
+char *trace_append_file(const char *dir, const char *name)
{
char *file;
int ret;
@@ -265,7 +265,7 @@ char **tracefs_event_systems(const char *tracing_dir)
if (!tracing_dir)
return NULL;
- events_dir = append_file(tracing_dir, "events");
+ events_dir = trace_append_file(tracing_dir, "events");
if (!events_dir)
return NULL;
@@ -290,14 +290,14 @@ char **tracefs_event_systems(const char *tracing_dir)
strcmp(name, "..") == 0)
continue;
- sys = append_file(events_dir, name);
+ sys = trace_append_file(events_dir, name);
ret = stat(sys, &st);
if (ret < 0 || !S_ISDIR(st.st_mode)) {
free(sys);
continue;
}
- enable = append_file(sys, "enable");
+ enable = trace_append_file(sys, "enable");
ret = stat(enable, &st);
if (ret >= 0)
@@ -359,7 +359,7 @@ char **tracefs_system_events(const char *tracing_dir, const char *system)
strcmp(name, "..") == 0)
continue;
- event = append_file(system_dir, name);
+ event = trace_append_file(system_dir, name);
ret = stat(event, &st);
if (ret < 0 || !S_ISDIR(st.st_mode)) {
free(event);
@@ -401,7 +401,7 @@ char **tracefs_tracers(const char *tracing_dir)
if (!tracing_dir)
return NULL;
- available_tracers = append_file(tracing_dir, "available_tracers");
+ available_tracers = trace_append_file(tracing_dir, "available_tracers");
if (!available_tracers)
return NULL;
@@ -497,7 +497,7 @@ static int read_header(struct tep_handle *tep, const char *tracing_dir)
int len;
int ret = -1;
- header = append_file(tracing_dir, "events/header_page");
+ header = trace_append_file(tracing_dir, "events/header_page");
ret = stat(header, &st);
if (ret < 0)
diff --git a/lib/tracefs/tracefs-instance.c b/lib/tracefs/tracefs-instance.c
index 50e88534..befc0333 100644
--- a/lib/tracefs/tracefs-instance.c
+++ b/lib/tracefs/tracefs-instance.c
@@ -13,6 +13,7 @@
#include <errno.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <dirent.h>
#include <linux/limits.h>
#include "tracefs.h"
#include "tracefs-local.h"
@@ -291,3 +292,54 @@ bool tracefs_dir_exists(struct tracefs_instance *instance, char *name)
{
return check_file_exists(instance, name, true);
}
+
+/**
+ * tracefs_instances_walk - Iterate through all ftrace instances in the system
+ * @callback: user callback, called for each instance. Instance name is passed
+ * as input parameter. If the @callback returns non-zero,
+ * the iteration stops.
+ * @context: user context, passed to the @callback.
+ *
+ * Returns -1 in case of an error, 0 otherwise.
+ */
+int tracefs_instances_walk(int (*callback)(const char *, void *), void *context)
+{
+ struct dirent *dent;
+ char *path = NULL;
+ DIR *dir = NULL;
+ struct stat st;
+ int fret = -1;
+ int ret;
+
+ path = tracefs_get_tracing_file("instances");
+ if (!path)
+ return -1;
+ ret = stat(path, &st);
+ if (ret < 0 || !S_ISDIR(st.st_mode))
+ goto out;
+
+ dir = opendir(path);
+ if (!dir)
+ goto out;
+ fret = 0;
+ while ((dent = readdir(dir))) {
+ char *instance;
+
+ if (strcmp(dent->d_name, ".") == 0 ||
+ strcmp(dent->d_name, "..") == 0)
+ continue;
+ instance = trace_append_file(path, dent->d_name);
+ ret = stat(instance, &st);
+ free(instance);
+ if (ret < 0 || !S_ISDIR(st.st_mode))
+ continue;
+ if (callback(dent->d_name, context))
+ break;
+ }
+
+out:
+ if (dir)
+ closedir(dir);
+ tracefs_put_tracing_file(path);
+ return fret;
+}
diff --git a/tracecmd/trace-stat.c b/tracecmd/trace-stat.c
index 260d0c37..c242dae2 100644
--- a/tracecmd/trace-stat.c
+++ b/tracecmd/trace-stat.c
@@ -7,7 +7,6 @@
#include <sys/stat.h>
#include <stdlib.h>
#include <stdio.h>
-#include <dirent.h>
#include <getopt.h>
#include <unistd.h>
#include <fcntl.h>
@@ -140,48 +139,23 @@ static void report_file(struct buffer_instance *instance,
free(str);
}
-static void report_instances(void)
+static int report_instance(const char *name, void *data)
{
- struct dirent *dent;
- bool first = true;
- char *path = NULL;
- DIR *dir = NULL;
- struct stat st;
- int ret;
-
- path = tracefs_get_tracing_file("instances");
- if (!path)
- return;
- ret = stat(path, &st);
- if (ret < 0 || !S_ISDIR(st.st_mode))
- goto out;
-
- dir = opendir(path);
- if (!dir)
- goto out;
-
- while ((dent = readdir(dir))) {
- char *instance;
+ bool *first = (bool *)data;
- if (strcmp(dent->d_name, ".") == 0 ||
- strcmp(dent->d_name, "..") == 0)
- continue;
- instance = append_file(path, dent->d_name);
- ret = stat(instance, &st);
- free(instance);
- if (ret < 0 || !S_ISDIR(st.st_mode))
- continue;
- if (first) {
- first = false;
- printf("\nInstances:\n");
- }
- printf(" %s\n", dent->d_name);
+ if (*first) {
+ *first = false;
+ printf("\nInstances:\n");
}
+ printf(" %s\n", name);
+ return 0;
+}
-out:
- if (dir)
- closedir(dir);
- tracefs_put_tracing_file(path);
+static void report_instances(void)
+{
+ bool first = true;
+
+ tracefs_instances_walk(report_instance, &first);
}
struct event_iter *trace_event_iter_alloc(const char *path)
--
2.26.2
next prev parent reply other threads:[~2020-07-17 8:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 8:03 [PATCH 0/2] Enhancements to trace-cmd clear Tzvetomir Stoyanov (VMware)
2020-07-17 8:03 ` Tzvetomir Stoyanov (VMware) [this message]
2020-07-17 13:25 ` [PATCH 1/2] trace-cmd: Add new tracefs API tracefs_instances_walk() Steven Rostedt
2020-07-17 8:03 ` [PATCH 2/2] trace-cmd: Enhance "trace-cmd clear" to be instance aware Tzvetomir Stoyanov (VMware)
2020-07-17 13:31 ` Steven Rostedt
2020-07-17 14:06 ` Steven Rostedt
2020-07-17 14:29 ` 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=20200717080326.82151-2-tz.stoyanov@gmail.com \
--to=tz.stoyanov@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/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).