libtracefs fixes and improvements
v4 cover libtracefs fixes and improvements
A few final tracefs library fixes and improvements, before releasing it as an official library.
v4 changes:
- Added new patch: "Use tracefs_list_free() API".
- Hid the library non API functions.
- When creating a new trace instance, inherit the permissions of the parent "instance" directory.
v3 changes:
- Addressed Steven's comments.
v2 changes:
- Change tracefs_instance_create() to return pointer to allocated trace instance structure.
- Add new API: tracefs_instance_is_new() to check if the trace instance is newly created by the library.
Tzvetomir Stoyanov (VMware) (8):
trace-cmd: Change tracefs.h include path
libtracefs: Change get name API to return constant string
libtracefs: Use tracefs_list_free() API
libtracefs: Add new API to check if instance exists
libtracefs: Combine allocate and create APIs into one
libtracefs: Add new tracefs API tracefs_instances_walk()
trace-cmd: Add new libtrasefs API to get the current trace clock
libtracefs: Hide non API functions
include/trace-cmd/trace-cmd.h | 1 + include/tracefs/tracefs.h | 10 +- lib/trace-cmd/trace-timesync.c | 3 +- lib/tracefs/include/tracefs-local.h | 3 + lib/tracefs/tracefs-events.c | 26 ++-- lib/tracefs/tracefs-instance.c | 194 +++++++++++++++++++++++++--- lib/tracefs/tracefs-utils.c | 3 +- tracecmd/include/trace-local.h | 4 +- tracecmd/trace-record.c | 72 +++++------ tracecmd/trace-show.c | 2 +- tracecmd/trace-stat.c | 81 +++--------- utest/tracefs-utest.c | 107 +++++++++++++-- 12 files changed, 350 insertions(+), 156 deletions(-)
Signature · 1 line
2.28.0
PATCH v4 1/8 trace-cmd: Change tracefs.h include path
The tracefs.h file is installed in
<install_prefix>/include/tracefs/tracefs.h.
However, in trace-cmd.h it is inluded just as "tracefs.h". When trace-cmd.h is used in trace-cmd build context that include is not a problem, as all local header paths are described in the Makefiles. But when other application uses trace-cmd.h and tracefs.h, installed in the system, the compilation fails due to this broken include.
--- include/trace-cmd/trace-cmd.h | 1 + 1 file changed, 1 insertion(+)
include/trace-cmd/trace-cmd.h +1 -0
@@ -7,6 +7,7 @@#define _TRACE_CMD_H#include "traceevent/event-parse.h" +#include "tracefs/tracefs.h" #define TRACECMD_MAGIC { 23, 8, 68 }
Signature · 1 line
2.28.0
PATCH v4 2/8 libtracefs: Change get name API to return constant string
In reply to Tzvetomir Stoyanov (VMware)The tracefs_instance_get_name() API returns a pointer to internal string. This string is not meant to be changed by the API callers, that's why it should be constant.
--- include/tracefs/tracefs.h | 2 +- lib/tracefs/tracefs-instance.c | 2 +- tracecmd/trace-record.c | 2 +- utest/tracefs-utest.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
include/tracefs/tracefs.h +1 -1
@@ -24,7 +24,7 @@ struct tracefs_instance *tracefs_instance_alloc(const char *name);void tracefs_instance_free (struct tracefs_instance *instance);int tracefs_instance_create (struct tracefs_instance *instance);int tracefs_instance_destroy (struct tracefs_instance *instance); -char *tracefs_instance_get_name (struct tracefs_instance *instance); +const char *tracefs_instance_get_name (struct tracefs_instance *instance);char *tracefs_instance_get_file (struct tracefs_instance *instance,const char *file);char *tracefs_instance_get_dir (struct tracefs_instance *instance);
lib/tracefs/tracefs-instance.c +1 -1
@@ -169,7 +169,7 @@ char *tracefs_instance_get_dir(struct tracefs_instance *instance)* Returns the name of the given @instance. * The returned string must *not* be freed. */ -char *tracefs_instance_get_name (struct tracefs_instance *instance) +const char *tracefs_instance_get_name (struct tracefs_instance *instance) {if (instance)return instance->name;
tracecmd/trace-record.c +1 -1
@@ -3861,7 +3861,7 @@ static void connect_to_agent(struct buffer_instance *instance)unsigned int *ports;int i, *fds =NULL ;bool use_fifos = false; -char *name; +const char *name; name =tracefs_instance_get_name (instance->tracefs);if (!no_fifos) {
utest/tracefs-utest.c +1 -1
@@ -180,7 +180,7 @@ static void test_instance_file(void) {struct tracefs_instance *instance =NULL ;const char *name =get_rand_str (); -char *inst_name =NULL ; +const char *inst_name =NULL ;const char *tdir;char *inst_file;char *inst_dir;
Signature · 1 line
2.28.0
PATCH v4 3/8 libtracefs: Use tracefs_list_free() API
In reply to Tzvetomir Stoyanov (VMware)Use the tracefs_list_free() for cleaning lists of events and systems, returned by tracefs_system_events() and tracefs_event_systems() APIs.
--- lib/tracefs/tracefs-events.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
lib/tracefs/tracefs-events.c +2 -10
@@ -481,11 +481,7 @@ next_event: failure = ret; } -if (events) { -for (i =0 ; events[i]; i++) -free (events[i]); -free (events); - } +tracefs_list_free (events);return failure; }
@@ -564,11 +560,7 @@ static int fill_local_events_system(const char *tracing_dir,/* always succeed because parsing failures are not critical */ ret =0 ; out: -if (systems) { -for (i =0 ; systems[i]; i++) -free (systems[i]); -free (systems); - } +tracefs_list_free (systems);return ret; }
Signature · 1 line
2.28.0
PATCH v4 4/8 libtracefs: Add new API to check if instance exists
In reply to Tzvetomir Stoyanov (VMware)A new API is implemented:
tracefs_instance_exists()
which can be used to check if ftrace instance with given name exists in the system.
--- include/tracefs/tracefs.h | 1 + lib/tracefs/tracefs-instance.c | 22 +++++++++++++++++++++- utest/tracefs-utest.c | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-)
include/tracefs/tracefs.h +1 -0
@@ -33,6 +33,7 @@ int tracefs_instance_file_write(struct tracefs_instance *instance,char *tracefs_instance_file_read (struct tracefs_instance *instance,char *file,int *psize); +bool tracefs_instance_exists (const char *name);bool tracefs_file_exists (struct tracefs_instance *instance,char *name);bool tracefs_dir_exists (struct tracefs_instance *instance,char *name);
lib/tracefs/tracefs-instance.c +21 -1
@@ -257,7 +257,10 @@ static bool check_file_exists(struct tracefs_instance *instance,int ret; path =tracefs_instance_get_dir (instance); -snprintf (file,PATH_MAX ,"%s/%s" , path, name); +if (name) +snprintf (file,PATH_MAX ,"%s/%s" , path, name); +else +snprintf (file,PATH_MAX ,"%s" , path);tracefs_put_tracing_file (path); ret =stat (file, &st);if (ret <0 )
@@ -266,6 +269,23 @@ static bool check_file_exists(struct tracefs_instance *instance,return !dir == !S_ISDIR (st.st_mode); } +/** +* tracefs_instance_exists - Check an instance with given name exists +* @name: name of the instance +* +* Returns true if the instance exists, false otherwise +* +*/ +bool tracefs_instance_exists (const char *name) +{ +char file[PATH_MAX ]; + +if (!name) +return false; +snprintf (file,PATH_MAX ,"instances/%s" , name); +return check_file_exists (NULL , file, true); +} +/** * tracefs_file_exists - Check if a file with given name exists in given instance * @instance: ftrace instance, can be NULL for the top instance
utest/tracefs-utest.c +2 -0
@@ -197,6 +197,7 @@ static void test_instance_file(void)CU_TEST (asprintf (&inst_dir,"%s/instances/%s" , tdir, name) >0 );CU_TEST (stat (inst_dir, &st) !=0 ); +CU_TEST (tracefs_instance_exists (name) == false); instance =tracefs_instance_alloc (name);CU_TEST (instance !=NULL );CU_TEST (stat (inst_dir, &st) !=0 );
@@ -205,6 +206,7 @@ static void test_instance_file(void)CU_TEST (strcmp (inst_name, name) ==0 );CU_TEST (tracefs_instance_create (instance) ==0 ); +CU_TEST (tracefs_instance_exists (name) == true);CU_TEST (stat (inst_dir, &st) ==0 );CU_TEST (S_ISDIR (st.st_mode));
Signature · 1 line
2.28.0
PATCH v4 5/8 libtracefs: Combine allocate and create APIs into one
In reply to Tzvetomir Stoyanov (VMware)Having two APIs for allocating and creating trace instance can be confusing. The tracefs_instance_alloc() is removed and its logic is moved to tracefs_instance_create() API. This single API first creates the instance in the system (if it does not exist) and then allocates and initializes tracefs_instance structure. Trace-cmd code and unit tests are modified to use the new API.
A new API is introduced, to check if the tracefs instance is newly created by the library or if it already exist.
tracefs_instance_is_new()
--- include/tracefs/tracefs.h | 4 +- lib/trace-cmd/trace-timesync.c | 3 +- lib/tracefs/tracefs-instance.c | 80 ++++++++++++++++++++++++++++------ tracecmd/include/trace-local.h | 4 +- tracecmd/trace-record.c | 70 ++++++++++++++--------------- tracecmd/trace-show.c | 2 +- tracecmd/trace-stat.c | 2 +- utest/tracefs-utest.c | 25 +++++------ 8 files changed, 117 insertions(+), 73 deletions(-)
include/tracefs/tracefs.h +2 -2
@@ -20,10 +20,10 @@ char *tracefs_find_tracing_dir(void);/* ftarce instances */ struct tracefs_instance ; -struct tracefs_instance *tracefs_instance_alloc (const char *name);void tracefs_instance_free (struct tracefs_instance *instance); -int tracefs_instance_create (struct tracefs_instance *instance); +struct tracefs_instance *tracefs_instance_create (const char *name);int tracefs_instance_destroy (struct tracefs_instance *instance); +bool tracefs_instance_is_new (struct tracefs_instance *instance);const char *tracefs_instance_get_name (struct tracefs_instance *instance);char *tracefs_instance_get_file (struct tracefs_instance *instance,const char *file);
lib/trace-cmd/trace-timesync.c +1 -2
@@ -240,11 +240,10 @@ clock_synch_create_instance(const char *clock, unsigned int cid)snprintf (inst_name,256 ,"clock_synch-%d" , cid); - instance =tracefs_instance_alloc (inst_name); + instance =tracefs_instance_create (inst_name);if (!instance)return NULL ; -tracefs_instance_create (instance);tracefs_instance_file_write (instance,"trace" ,"\0" );if (clock)tracefs_instance_file_write (instance,"trace_clock" , clock);
lib/tracefs/tracefs-instance.c +66 -14
117 lines not on this page · raw message
tracecmd/include/trace-local.h +2 -2
@@ -199,6 +199,7 @@ struct filter_pids {struct buffer_instance {struct buffer_instance *next; +char *name;struct tracefs_instance *tracefs;unsigned long long trace_id;char *cpumask;
@@ -277,7 +278,7 @@ extern struct buffer_instance *first_instance;#define is_agent (instance) ((instance)->flags & BUFFER_FL_AGENT)#define is_guest (instance) ((instance)->flags & BUFFER_FL_GUEST) -struct buffer_instance *create_instance (const char *name); +struct buffer_instance *allocate_instance (const char *name);void add_instance (struct buffer_instance *instance,int cpu_count);void update_first_instance (struct buffer_instance *instance,int topt);
@@ -286,7 +287,6 @@ void show_instance_file(struct buffer_instance *instance, const char *name);int get_guest_vcpu_pid (unsigned int guest_cid,unsigned int guest_vcpu);/* moved from trace-cmd.h */ -void tracecmd_create_top_instance (char *name);void tracecmd_remove_instances (void );int tracecmd_add_event (const char *event_str,int stack);void tracecmd_enable_events (void );
tracecmd/trace-record.c +32 -38
148 lines not on this page · raw message
tracecmd/trace-show.c +1 -1
@@ -64,7 +64,7 @@ void trace_show(int argc, char **argv)if (buffer)die ("Can only show one buffer at a time" ); buffer = optarg; - instance =create_instance (optarg); + instance =allocate_instance (optarg);if (!instance)die ("Failed to create instance" );break ;
tracecmd/trace-stat.c +1 -1
@@ -926,7 +926,7 @@ void trace_stat (int argc, char **argv)usage (argv);break ;case 'B' : - instance =create_instance (optarg); + instance =allocate_instance (optarg);if (!instance)die ("Failed to create instance" );add_instance (instance,tracecmd_count_cpus ());
utest/tracefs-utest.c +12 -13
@@ -179,6 +179,7 @@ static void test_instance_file_read(struct tracefs_instance *inst, char *fname)static void test_instance_file (void ) {struct tracefs_instance *instance =NULL ; +struct tracefs_instance *second =NULL ;const char *name =get_rand_str ();const char *inst_name =NULL ;const char *tdir;
@@ -198,17 +199,19 @@ static void test_instance_file(void)CU_TEST (stat (inst_dir, &st) !=0 );CU_TEST (tracefs_instance_exists (name) == false); - instance =tracefs_instance_alloc (name); + instance =tracefs_instance_create (name);CU_TEST (instance !=NULL ); -CU_TEST (stat (inst_dir, &st) !=0 ); - inst_name =tracefs_instance_get_name (instance); -CU_TEST (inst_name !=NULL ); -CU_TEST (strcmp (inst_name, name) ==0 ); - -CU_TEST (tracefs_instance_create (instance) ==0 ); +CU_TEST (tracefs_instance_is_new (instance)); + second =tracefs_instance_create (name); +CU_TEST (second !=NULL ); +CU_TEST (!tracefs_instance_is_new (second)); +tracefs_instance_free (second);CU_TEST (tracefs_instance_exists (name) == true);CU_TEST (stat (inst_dir, &st) ==0 );CU_TEST (S_ISDIR (st.st_mode)); + inst_name =tracefs_instance_get_name (instance); +CU_TEST (inst_name !=NULL ); +CU_TEST (strcmp (inst_name, name) ==0 ); fname =tracefs_instance_get_dir (NULL );CU_TEST (fname !=NULL );
@@ -474,12 +477,8 @@ static int test_suite_init(void) test_tep =tracefs_local_events_system (NULL , systems);if (test_tep ==NULL )return 1 ; - - test_instance =tracefs_instance_alloc (TEST_INSTANCE_NAME ); -if (test_instance ==NULL ) -return 1 ; - -if (tracefs_instance_create (test_instance) <0 ) + test_instance =tracefs_instance_create (TEST_INSTANCE_NAME ); +if (!test_instance)return 1 ;return 0 ;
Signature · 1 line
2.28.0
Re: [PATCH v4 5/8] libtracefs: Combine allocate and create APIs into one
Quoted 14 lines · On Tue, 17 Nov 2020 09:45:54 +0200 "Tzvetomir Stoyanov (VMware)"…
lib/tracefs/tracefs-instance.c +13
-0+static mode_t get_trace_file_permissions (char *name) +{ +mode_t rmode =0 ; +struct stat st; +char *path; +int ret; + + path =tracefs_get_tracing_file (name); +if (!path) +return 0 ; + ret =stat (path, &st); +if (ret) + goto out;
lib/tracefs/tracefs-instance.c void tracefs_instance_free(struct tracefs_instance *instance) · line 84
Quoted 10 lines
lib/tracefs/tracefs-instance.c +10
-0+ rmode = st.st_mode &ACCESSPERMS ; +out: +tracefs_put_tracing_file (path); +return rmode; +} + +/** +* tracefs_instance_is_new - Check if the instance is newly created by the library +* @instance: Pointer to an ftrace instance +*
This part should be a separate patch. I decided to break it up into two patches (the following emails) instead of having you send another version. Just let me know if what I have is good for you.
-- Steve
PATCH 1/1 libtracefs: Use the permissions of the instances directory for instances
From: "Tzvetomir Stoyanov (VMware)" <[email protected]>
Use the same permissions of the instances directory for the permissions of creating a new instance.
--- lib/tracefs/tracefs-instance.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)
lib/tracefs/tracefs-instance.c +25 -3
@@ -57,6 +57,25 @@ void tracefs_instance_free(struct tracefs_instance *instance)free (instance); } +static mode_t get_trace_file_permissions (char *name) +{ +mode_t rmode =0 ; +struct stat st; +char *path; +int ret; + + path =tracefs_get_tracing_file (name); +if (!path) +return 0 ; + ret =stat (path, &st); +if (ret) + goto out; + rmode = st.st_mode &ACCESSPERMS ; +out: +tracefs_put_tracing_file (path); +return rmode; +} +/** * tracefs_instance_create - Create a new ftrace instance * @instance: Pointer to the instance to be created
@@ -67,15 +86,18 @@ void tracefs_instance_free(struct tracefs_instance *instance)int tracefs_instance_create (struct tracefs_instance *instance) {struct stat st; +mode_t mode;char *path;int ret; path =tracefs_instance_get_dir (instance); ret =stat (path, &st); -if (ret <0 ) - ret =mkdir (path,0777 ); -else +if (ret <0 ) { + mode =get_trace_file_permissions ("instances" ); + ret =mkdir (path, mode); + }else { ret =1 ; + }tracefs_put_tracing_file (path);return ret; }
Signature · 1 line
2.25.4
Re: [PATCH v4.1 - 5.1/8] libtracefs: Use the permissions of the instances directory for instances
Quoted 67 lines · Steven Rostedt
From: "Tzvetomir Stoyanov (VMware)" <[email protected]>
Use the same permissions of the instances directory for the permissions of creating a new instance.
Signed-off-by Tzvetomir Stoyanov (VMware) <[email protected]>Signed-off-by Steven Rostedt (VMware) <[email protected]>--- lib/tracefs/tracefs-instance.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)lib/tracefs/tracefs-instance.c +25
-4@@ -57,6 +57,25 @@ void tracefs_instance_free(struct tracefs_instance *instance)free (instance); } +static mode_t get_trace_file_permissions (char *name) +{ +mode_t rmode =0 ; +struct stat st; +char *path; +int ret; + + path =tracefs_get_tracing_file (name); +if (!path) +return 0 ; + ret =stat (path, &st); +if (ret) + goto out; + rmode = st.st_mode &ACCESSPERMS ; +out: +tracefs_put_tracing_file (path); +return rmode; +} +/** * tracefs_instance_create - Create a new ftrace instance * @instance: Pointer to the instance to be created @@ -67,15 +86,18 @@ void tracefs_instance_free(struct tracefs_instance *instance)int tracefs_instance_create (struct tracefs_instance *instance) {struct stat st; +mode_t mode;char *path;int ret; path =tracefs_instance_get_dir (instance); ret =stat (path, &st); -if (ret <0 ) - ret =mkdir (path,0777 ); -else +if (ret <0 ) { + mode =get_trace_file_permissions ("instances" ); + ret =mkdir (path, mode); + }else { ret =1 ; + }tracefs_put_tracing_file (path);return ret; } --
Quoted 2 lines
2.25.4
I'm OK with that split.
Thanks, Steven!
Signature · 2 lines
Tzvetomir (Ceco) Stoyanov VMware Open Source Technology Center
PATCH 1/1 libtracefs: Combine allocate and create APIs into one
In reply to Steven RostedtFrom: "Tzvetomir Stoyanov (VMware)" <[email protected]>
Having two APIs for allocating and creating trace instance can be confusing. The tracefs_instance_alloc() is removed and its logic is moved to tracefs_instance_create() API. This single API first creates the instance in the system (if it does not exist) and then allocates and initializes tracefs_instance structure. Trace-cmd code and unit tests are modified to use the new API.
A new API is introduced, to check if the tracefs instance is newly created by the library or if it already exist.
tracefs_instance_is_new()
--- include/tracefs/tracefs.h | 4 +- lib/trace-cmd/trace-timesync.c | 3 +- lib/tracefs/tracefs-instance.c | 56 ++++++++++++++++++++------- tracecmd/include/trace-local.h | 4 +- tracecmd/trace-record.c | 70 ++++++++++++++++------------------ tracecmd/trace-show.c | 2 +- tracecmd/trace-stat.c | 2 +- utest/tracefs-utest.c | 25 ++++++------ 8 files changed, 94 insertions(+), 72 deletions(-)
include/tracefs/tracefs.h +2 -2
@@ -20,10 +20,10 @@ char *tracefs_find_tracing_dir(void);/* ftarce instances */ struct tracefs_instance ; -struct tracefs_instance *tracefs_instance_alloc (const char *name);void tracefs_instance_free (struct tracefs_instance *instance); -int tracefs_instance_create (struct tracefs_instance *instance); +struct tracefs_instance *tracefs_instance_create (const char *name);int tracefs_instance_destroy (struct tracefs_instance *instance); +bool tracefs_instance_is_new (struct tracefs_instance *instance);const char *tracefs_instance_get_name (struct tracefs_instance *instance);char *tracefs_instance_get_file (struct tracefs_instance *instance,const char *file);
lib/trace-cmd/trace-timesync.c +1 -2
@@ -240,11 +240,10 @@ clock_synch_create_instance(const char *clock, unsigned int cid)snprintf (inst_name,256 ,"clock_synch-%d" , cid); - instance =tracefs_instance_alloc (inst_name); + instance =tracefs_instance_create (inst_name);if (!instance)return NULL ; -tracefs_instance_create (instance);tracefs_instance_file_write (instance,"trace" ,"\0" );if (clock)tracefs_instance_file_write (instance,"trace_clock" , clock);
lib/tracefs/tracefs-instance.c +43 -13
97 lines not on this page · raw message
tracecmd/include/trace-local.h +2 -2
@@ -199,6 +199,7 @@ struct filter_pids {struct buffer_instance {struct buffer_instance *next; +char *name;struct tracefs_instance *tracefs;unsigned long long trace_id;char *cpumask;
@@ -277,7 +278,7 @@ extern struct buffer_instance *first_instance;#define is_agent (instance) ((instance)->flags & BUFFER_FL_AGENT)#define is_guest (instance) ((instance)->flags & BUFFER_FL_GUEST) -struct buffer_instance *create_instance (const char *name); +struct buffer_instance *allocate_instance (const char *name);void add_instance (struct buffer_instance *instance,int cpu_count);void update_first_instance (struct buffer_instance *instance,int topt);
@@ -286,7 +287,6 @@ void show_instance_file(struct buffer_instance *instance, const char *name);int get_guest_vcpu_pid (unsigned int guest_cid,unsigned int guest_vcpu);/* moved from trace-cmd.h */ -void tracecmd_create_top_instance (char *name);void tracecmd_remove_instances (void );int tracecmd_add_event (const char *event_str,int stack);void tracecmd_enable_events (void );
tracecmd/trace-record.c +32 -38
148 lines not on this page · raw message
tracecmd/trace-show.c +1 -1
@@ -64,7 +64,7 @@ void trace_show(int argc, char **argv)if (buffer)die ("Can only show one buffer at a time" ); buffer = optarg; - instance =create_instance (optarg); + instance =allocate_instance (optarg);if (!instance)die ("Failed to create instance" );break ;
tracecmd/trace-stat.c +1 -1
@@ -926,7 +926,7 @@ void trace_stat (int argc, char **argv)usage (argv);break ;case 'B' : - instance =create_instance (optarg); + instance =allocate_instance (optarg);if (!instance)die ("Failed to create instance" );add_instance (instance,tracecmd_count_cpus ());
utest/tracefs-utest.c +12 -13
@@ -179,6 +179,7 @@ static void test_instance_file_read(struct tracefs_instance *inst, char *fname)static void test_instance_file (void ) {struct tracefs_instance *instance =NULL ; +struct tracefs_instance *second =NULL ;const char *name =get_rand_str ();const char *inst_name =NULL ;const char *tdir;
@@ -198,17 +199,19 @@ static void test_instance_file(void)CU_TEST (stat (inst_dir, &st) !=0 );CU_TEST (tracefs_instance_exists (name) == false); - instance =tracefs_instance_alloc (name); + instance =tracefs_instance_create (name);CU_TEST (instance !=NULL ); -CU_TEST (stat (inst_dir, &st) !=0 ); - inst_name =tracefs_instance_get_name (instance); -CU_TEST (inst_name !=NULL ); -CU_TEST (strcmp (inst_name, name) ==0 ); - -CU_TEST (tracefs_instance_create (instance) ==0 ); +CU_TEST (tracefs_instance_is_new (instance)); + second =tracefs_instance_create (name); +CU_TEST (second !=NULL ); +CU_TEST (!tracefs_instance_is_new (second)); +tracefs_instance_free (second);CU_TEST (tracefs_instance_exists (name) == true);CU_TEST (stat (inst_dir, &st) ==0 );CU_TEST (S_ISDIR (st.st_mode)); + inst_name =tracefs_instance_get_name (instance); +CU_TEST (inst_name !=NULL ); +CU_TEST (strcmp (inst_name, name) ==0 ); fname =tracefs_instance_get_dir (NULL );CU_TEST (fname !=NULL );
@@ -474,12 +477,8 @@ static int test_suite_init(void) test_tep =tracefs_local_events_system (NULL , systems);if (test_tep ==NULL )return 1 ; - - test_instance =tracefs_instance_alloc (TEST_INSTANCE_NAME ); -if (test_instance ==NULL ) -return 1 ; - -if (tracefs_instance_create (test_instance) <0 ) + test_instance =tracefs_instance_create (TEST_INSTANCE_NAME ); +if (!test_instance)return 1 ;return 0 ;
Signature · 1 line
2.25.4
PATCH v4 6/8 libtracefs: Add new tracefs API tracefs_instances_walk()
In reply to Tzvetomir Stoyanov (VMware)The logic for finding all configured ftrace instances is encapuslated in a 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.
--- include/tracefs/tracefs.h | 1 + lib/tracefs/include/tracefs-local.h | 1 + lib/tracefs/tracefs-events.c | 14 ++++---- lib/tracefs/tracefs-instance.c | 55 +++++++++++++++++++++++++++++ tracecmd/trace-stat.c | 52 +++++++-------------------- utest/tracefs-utest.c | 52 +++++++++++++++++++++++++++ 6 files changed, 129 insertions(+), 46 deletions(-)
include/tracefs/tracefs.h +1 -0
@@ -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_instance_exists (const char *name);bool tracefs_file_exists (struct tracefs_instance *instance,char *name);
lib/tracefs/include/tracefs-local.h +1 -0
@@ -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 */
lib/tracefs/tracefs-events.c +7 -7
@@ -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 ;
@@ -493,7 +493,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 )
lib/tracefs/tracefs-instance.c +55 -0
64 lines not on this page · raw message
tracecmd/trace-stat.c +13 -39
68 lines not on this page · raw message
utest/tracefs-utest.c +52 -0
62 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH v4 7/8 trace-cmd: Add new libtrasefs API to get the current trace clock
In reply to Tzvetomir Stoyanov (VMware)A new API is added to tracefs library:
tracefs_get_clock()
It reads the trace_clock file from the ftrace file system, parses it and returns a string with the current trace clock. The returned string must be freed by free().
--- include/tracefs/tracefs.h | 2 ++ lib/tracefs/tracefs-instance.c | 35 ++++++++++++++++++++++++++++++++++ tracecmd/trace-stat.c | 27 +++++--------------------- utest/tracefs-utest.c | 30 ++++++++++++++++++++++++++++- 4 files changed, 71 insertions(+), 23 deletions(-)
include/tracefs/tracefs.h +2 -0
@@ -57,4 +57,6 @@ struct tep_handle *tracefs_local_events_system(const char *tracing_dir,int tracefs_fill_local_events (const char *tracing_dir,struct tep_handle *tep,int *parsing_failures); +char *tracefs_get_clock (struct tracefs_instance *instance); +#endif /* _TRACE_FS_H */
lib/tracefs/tracefs-instance.c +35 -0
@@ -418,3 +418,38 @@ out:tracefs_put_tracing_file (path);return fret; } + +/** +* tracefs_get_clock - Get the current trace clock +* @instance: ftrace instance, can be NULL for the top instance +* +* Returns the current trace clock of the given instance, or NULL in +* case of an error. +* The return string must be freed by free() +*/ +char *tracefs_get_clock (struct tracefs_instance *instance) +{ +char *all_clocks =NULL ; +char *ret =NULL ; +int bytes =0 ; +char *clock; +char *cont; + + all_clocks =tracefs_instance_file_read (instance,"trace_clock" , &bytes); +if (!all_clocks || !bytes) + goto out; + + clock =strstr (all_clocks,"[" ); +if (!clock) + goto out; + clock++; + cont =strstr (clock,"]" ); +if (!cont) + goto out; + *cont ='\0' ; + + ret =strdup (clock); +out: +free (all_clocks); +return ret; +}
tracecmd/trace-stat.c +5 -22
@@ -710,33 +710,16 @@ static void report_buffers(struct buffer_instance *instance)static void report_clock (struct buffer_instance *instance) { -char *str; -char *cont; +struct tracefs_instance *tracefs = instance ? instance->tracefs :NULL ;char *clock; - str =get_instance_file_content (instance,"trace_clock" ); -if (!str) -return ; - - clock =strstr (str,"[" ); -if (!clock) - goto out; - clock++; - - cont =strstr (clock,"]" ); -if (!cont)/* should never happen */ - goto out; - - *cont ='\0' ; + clock =tracefs_get_clock (tracefs);/* Default clock is "local", only show others */ -if (strcmp (clock,"local" ) ==0 ) - goto out; +if (clock && !strcmp (clock,"local" ) ==0 ) +printf ("\nClock: %s\n" , clock); -printf ("\nClock: %s\n" , clock); - - out: -free (str); +free (clock); }static void report_cpumask (struct buffer_instance *instance)
utest/tracefs-utest.c +29 -1
@@ -511,6 +511,33 @@ static void test_instances_walk(void) } } +static void current_clock_check (const char *clock) +{ +int size =0 ; +char *clocks; +char *str; + + clocks =tracefs_instance_file_read (test_instance,"trace_clock" , &size); +CU_TEST (clocks !=NULL ); +CU_TEST (size >strlen (clock)); + str =strstr (clocks, clock); +CU_TEST (str !=NULL ); +CU_TEST (str != clocks); +CU_TEST (*(str -1 ) =='[' ); +CU_TEST (*(str +strlen (clock)) ==']' ); +free (clocks); +} + +static void test_get_clock (void ) +{ +const char *clock; + + clock =tracefs_get_clock (test_instance); +CU_TEST (clock !=NULL ); +current_clock_check (clock); +free ((char *)clock); +} +static int test_suite_destroy (void ) {tracefs_instance_destroy (test_instance);
@@ -556,5 +583,6 @@ void test_tracefs_lib(void) test_local_events);CU_add_test (suite,"tracefs_instances_walk API" , test_instances_walk); - +CU_add_test (suite,"tracefs_get_clock API" , + test_get_clock); }
Signature · 1 line
2.28.0
PATCH v4 8/8 libtracefs: Hide non API functions
In reply to Tzvetomir Stoyanov (VMware)There are internal library functions, which are not declared as a static. They are used inside the library from different files. Hide them from the library users, as they are not part of the API:
trace_append_file()
str_read_file()
--- lib/tracefs/include/tracefs-local.h | 2 ++ lib/tracefs/tracefs-events.c | 2 +- lib/tracefs/tracefs-utils.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-)
lib/tracefs/include/tracefs-local.h +2 -0
@@ -6,6 +6,8 @@#ifndef _TRACE_FS_LOCAL_H#define _TRACE_FS_LOCAL_H +#define __hidden __attribute__((visibility ("hidden"))) +/* Can be overridden */ void warning (const char *fmt, ...);int str_read_file (const char *file,char **buffer);
lib/tracefs/tracefs-events.c +1 -1
@@ -210,7 +210,7 @@ static char **add_list_string(char **list, const char *name, int len)return list; } -char *trace_append_file (const char *dir,const char *name) +__hidden char *trace_append_file(const char *dir, const char *name) {char *file;int ret;
lib/tracefs/tracefs-utils.c +2 -1
@@ -15,6 +15,7 @@#include <unistd.h> #include "tracefs.h" +#include "tracefs-local.h" #define TRACEFS_PATH "/sys/kernel/tracing"#define DEBUGFS_PATH "/sys/kernel/debug"
@@ -188,7 +189,7 @@ void tracefs_put_tracing_file(char *name)free (name); } -int str_read_file (const char *file,char **buffer) +__hidden int str_read_file(const char *file, char **buffer) {char stbuf[BUFSIZ ];char *buf =NULL ;
Signature · 1 line
2.28.0