@@ -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);
int tracecmd_fill_local_events(const char *tracing_dir, struct tep_handle *pevent);
char **tracecmd_local_plugins(const char *tracing_dir);
@@ -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;
+ }
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
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(-)