trace-cmd: Some more minor updates
cover trace-cmd: Some more minor updates
These are minor changes and instead of having Tzvetomir resend the patches with the updates, I just made the changes.
First patch is to change the grammar of the function names that have "file_exist" and "dir_exist" to "file_exists" and "dir_exists" respectively, as they sound better for a native English speaker.
The second is just a micro-optimization of the return code of check_file_exists().
Steven Rostedt (VMware) (2):
trace-cmd: Use "exists" instead of "exist"
trace-cmd: Optimize check_file_exists()
----
include/tracefs/tracefs.h | 4 ++-- lib/tracefs/tracefs-instance.c | 21 ++++++++------------- tracecmd/trace-record.c | 2 +- utest/tracefs-utest.c | 28 ++++++++++++++-------------- 4 files changed, 25 insertions(+), 30 deletions(-)
PATCH 1/2 trace-cmd: Use "exists" instead of "exist"
From: "Steven Rostedt (VMware)" <[email protected]>
As a native English speaker, I find that the words "file_exists" and "dir_exists" sounds better to the ear than "file_exist" and "dir_exist". As "exist" is for the plural, and "exists" is for the singular.
--- include/tracefs/tracefs.h | 4 ++-- lib/tracefs/tracefs-instance.c | 14 +++++++------- tracecmd/trace-record.c | 2 +- utest/tracefs-utest.c | 28 ++++++++++++++-------------- 4 files changed, 24 insertions(+), 24 deletions(-)
include/tracefs/tracefs.h +2 -2
@@ -33,8 +33,8 @@ int tracefs_instance_file_write(struct tracefs_instance *instance,char *tracefs_instance_file_read (struct tracefs_instance *instance,char *file,int *psize); -bool tracefs_file_exist (struct tracefs_instance *instance,char *name); -bool tracefs_dir_exist (struct tracefs_instance *instance,char *name); +bool tracefs_file_exists (struct tracefs_instance *instance,char *name); +bool tracefs_dir_exists (struct tracefs_instance *instance,char *name);/* events */ void tracefs_list_free (char **list);
lib/tracefs/tracefs-instance.c +7 -7
@@ -248,7 +248,7 @@ char *tracefs_instance_file_read(struct tracefs_instance *instance,return buf; } -static bool check_file_exist (struct tracefs_instance *instance, +static bool check_file_exists (struct tracefs_instance *instance,char *name,bool dir) {char file[PATH_MAX ];
@@ -272,25 +272,25 @@ static bool check_file_exist(struct tracefs_instance *instance, }/** -* tracefs_file_exist - Check if a file with given name exists in given instance +* tracefs_file_exists - Check if a file with given name exists in given instance * @instance: ftrace instance, can be NULL for the top instance * @name: name of the file * * Returns true if the file exists, false otherwise */ -bool tracefs_file_exist (struct tracefs_instance *instance,char *name) +bool tracefs_file_exists (struct tracefs_instance *instance,char *name) { -return check_file_exist (instance, name, false); +return check_file_exists (instance, name, false); }/** -* tracefs_dir_exist - Check if a directory with given name exists in given instance +* tracefs_dir_exists - Check if a directory with given name exists in given instance * @instance: ftrace instance, can be NULL for the top instance * @name: name of the directory * * Returns true if the directory exists, false otherwise */ -bool tracefs_dir_exist (struct tracefs_instance *instance,char *name) +bool tracefs_dir_exists (struct tracefs_instance *instance,char *name) { -return check_file_exist (instance, name, true); +return check_file_exists (instance, name, true); }
tracecmd/trace-record.c +1 -1
@@ -4791,7 +4791,7 @@ static void clear_instance_error_log(struct buffer_instance *instance) {char *file; -if (!tracefs_file_exist (instance->tracefs,"error_log" )) +if (!tracefs_file_exists (instance->tracefs,"error_log" ))return ; file =tracefs_instance_get_file (instance->tracefs,"error_log" );
utest/tracefs-utest.c +14 -14
@@ -252,20 +252,20 @@ static void test_instance_file(void)tracefs_put_tracing_file (inst_file);free (fname); -CU_TEST (tracefs_file_exist (NULL , (char *)name) == false); -CU_TEST (tracefs_dir_exist (NULL , (char *)name) == false); -CU_TEST (tracefs_file_exist (instance, (char *)name) == false); -CU_TEST (tracefs_dir_exist (instance, (char *)name) == false); - -CU_TEST (tracefs_file_exist (NULL ,CUR_TRACER ) == true); -CU_TEST (tracefs_dir_exist (NULL ,CUR_TRACER ) == false); -CU_TEST (tracefs_file_exist (instance,CUR_TRACER ) == true); -CU_TEST (tracefs_dir_exist (instance,CUR_TRACER ) == false); - -CU_TEST (tracefs_file_exist (NULL ,PER_CPU ) == false); -CU_TEST (tracefs_dir_exist (NULL ,PER_CPU ) == true); -CU_TEST (tracefs_file_exist (instance,PER_CPU ) == false); -CU_TEST (tracefs_dir_exist (instance,PER_CPU ) == true); +CU_TEST (tracefs_file_exists (NULL , (char *)name) == false); +CU_TEST (tracefs_dir_exists (NULL , (char *)name) == false); +CU_TEST (tracefs_file_exists (instance, (char *)name) == false); +CU_TEST (tracefs_dir_exists (instance, (char *)name) == false); + +CU_TEST (tracefs_file_exists (NULL ,CUR_TRACER ) == true); +CU_TEST (tracefs_dir_exists (NULL ,CUR_TRACER ) == false); +CU_TEST (tracefs_file_exists (instance,CUR_TRACER ) == true); +CU_TEST (tracefs_dir_exists (instance,CUR_TRACER ) == false); + +CU_TEST (tracefs_file_exists (NULL ,PER_CPU ) == false); +CU_TEST (tracefs_dir_exists (NULL ,PER_CPU ) == true); +CU_TEST (tracefs_file_exists (instance,PER_CPU ) == false); +CU_TEST (tracefs_dir_exists (instance,PER_CPU ) == true);CU_TEST (tracefs_instance_destroy (NULL ) !=0 );CU_TEST (tracefs_instance_destroy (instance) ==0 );
Signature · 1 line
2.25.1
PATCH 2/2 trace-cmd: Optimize check_file_exists()
In reply to Steven RostedtFrom: "Steven Rostedt (VMware)" <[email protected]>
if (dir && !S_ISDIR(st.st_mode))
return false;
if (!dir && S_ISDIR(st.st_mode))
return false;
return true;Is the same as:
return !dir == !S_ISDIR(st.st_mode);
Micro-optimize the logic!
--- lib/tracefs/tracefs-instance.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
lib/tracefs/tracefs-instance.c +1 -6
@@ -263,12 +263,7 @@ static bool check_file_exists(struct tracefs_instance *instance,if (ret <0 )return false; -if (dir && !S_ISDIR (st.st_mode)) -return false; -if (!dir &&S_ISDIR (st.st_mode)) -return false; - -return true; +return !dir == !S_ISDIR (st.st_mode); }/**
Signature · 1 line
2.25.1
Quoted 8 lines · Steven Rostedt
These are minor changes and instead of having Tzvetomir resend the patches with the updates, I just made the changes.
First patch is to change the grammar of the function names that have "
file_exist" and "dir_exist" to "file_exists" and "dir_exists" respectively, as they sound better for a native English speaker.
Quoted 7 lines
The second is just a micro-optimization of the return code of
check_file_exists().Steven Rostedt (VMware) (2):
trace-cmd: Use "exists" instead of "exist"
trace-cmd: Optimizecheck_file_exists()
Looks good, thanks Steven!
Quoted 6 lines
----
include/tracefs/tracefs.h | 4 ++-- lib/tracefs/tracefs-instance.c | 21 ++++++++------------- tracecmd/trace-record.c | 2 +- utest/tracefs-utest.c | 28 ++++++++++++++-------------- 4 files changed, 25 insertions(+), 30 deletions(-)
Signature · 2 lines
Tzvetomir (Ceco) Stoyanov VMware Open Source Technology Center