The tracefs_get_tracing_dir() API mounts, locates and returns tracefs
mount point. In order to reflect more closely its logic, it is renamed
to tracefs_tracing_dir().
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@xxxxxxxxx>
---
include/tracefs.h | 4 ++--
src/tracefs-events.c | 8 ++++----
src/tracefs-utils.c | 6 +++---
test.c | 2 +-
utest/tracefs-utest.c | 14 +++++++-------
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/include/tracefs.h b/include/tracefs.h
index ae4ffa0..3d70aca 100644
--- a/include/tracefs.h
+++ b/include/tracefs.h
@@ -12,8 +12,8 @@
char *tracefs_get_tracing_file(const char *name);
void tracefs_put_tracing_file(char *name);
-/* tracefs_get_tracing_dir must *not* be freed */
-const char *tracefs_get_tracing_dir(void);
+/* the returned string must *not* be freed */
+const char *tracefs_tracing_dir(void);
/* ftrace instances */
struct tracefs_instance;
diff --git a/src/tracefs-events.c b/src/tracefs-events.c
index 58fa153..825f916 100644
--- a/src/tracefs-events.c
+++ b/src/tracefs-events.c
@@ -268,7 +268,7 @@ char **tracefs_event_systems(const char *tracing_dir)
int ret;
if (!tracing_dir)
- tracing_dir = tracefs_get_tracing_dir();
+ tracing_dir = tracefs_tracing_dir();
if (!tracing_dir)
return NULL;
@@ -342,7 +342,7 @@ char **tracefs_system_events(const char *tracing_dir, const char *system)
int ret;
if (!tracing_dir)
- tracing_dir = tracefs_get_tracing_dir();
+ tracing_dir = tracefs_tracing_dir();
if (!tracing_dir || !system)
return NULL;
@@ -407,7 +407,7 @@ char **tracefs_tracers(const char *tracing_dir)
int ret;
if (!tracing_dir)
- tracing_dir = tracefs_get_tracing_dir();
+ tracing_dir = tracefs_tracing_dir();
if (!tracing_dir)
return NULL;
@@ -544,7 +544,7 @@ static int fill_local_events_system(const char *tracing_dir,
int i;
if (!tracing_dir)
- tracing_dir = tracefs_get_tracing_dir();
+ tracing_dir = tracefs_tracing_dir();
if (!tracing_dir)
return -1;
diff --git a/src/tracefs-utils.c b/src/tracefs-utils.c
index d9850d9..0e96f8e 100644
--- a/src/tracefs-utils.c
+++ b/src/tracefs-utils.c
@@ -131,12 +131,12 @@ __hidden char *trace_find_tracing_dir(void)
}
/**
- * tracefs_get_tracing_dir - Get tracing directory
+ * tracefs_tracing_dir - Get tracing directory
*
* Returns string containing the full path to the system's tracing directory.
* The returned string must *not* be freed.
*/
-const char *tracefs_get_tracing_dir(void)
+const char *tracefs_tracing_dir(void)
{
static const char *tracing_dir;
@@ -182,7 +182,7 @@ char *tracefs_get_tracing_file(const char *name)
* tracefs_put_tracing_file - Free tracing file or directory name
*
* Frees tracing file or directory, returned by
- * tracefs_get_tracing_file() or tracefs_get_tracing_dir() APIs
+ * tracefs_get_tracing_file()API.
*/
void tracefs_put_tracing_file(char *name)
{
diff --git a/test.c b/test.c
index daf99d6..d38fc92 100644
--- a/test.c
+++ b/test.c
@@ -2,6 +2,6 @@
int main()
{
- tracefs_get_tracing_dir();
+ tracefs_tracing_dir();
return 0;
}
diff --git a/utest/tracefs-utest.c b/utest/tracefs-utest.c
index 965f1ec..b45a3c6 100644
--- a/utest/tracefs-utest.c
+++ b/utest/tracefs-utest.c
@@ -163,7 +163,7 @@ static void test_trace_file(void)
struct stat st;
char *file;
- tdir = tracefs_get_tracing_dir();
+ tdir = tracefs_tracing_dir();
CU_TEST(tdir != NULL);
CU_TEST(stat(tdir, &st) == 0);
CU_TEST(S_ISDIR(st.st_mode));
@@ -183,7 +183,7 @@ static void test_trace_file(void)
static void test_instance_file_read(struct tracefs_instance *inst, char *fname)
{
- const char *tdir = tracefs_get_tracing_dir();
+ const char *tdir = tracefs_tracing_dir();
char buf[BUFSIZ];
char *fpath;
char *file;
@@ -235,7 +235,7 @@ static void test_instance_file(void)
int size;
int ret;
- tdir = tracefs_get_tracing_dir();
+ tdir = tracefs_tracing_dir();
CU_TEST(tdir != NULL);
CU_TEST(asprintf(&inst_dir, "%s/instances/%s", tdir, name) > 0);
CU_TEST(stat(inst_dir, &st) != 0);
@@ -360,7 +360,7 @@ static void test_system_event(void)
char **events;
char *sdir = NULL;
- tdir = tracefs_get_tracing_dir();
+ tdir = tracefs_tracing_dir();
CU_TEST(tdir != NULL);
systems = tracefs_event_systems(tdir);
@@ -393,7 +393,7 @@ static void test_tracers(void)
char *tracer;
int i;
- tdir = tracefs_get_tracing_dir();
+ tdir = tracefs_tracing_dir();
CU_TEST(tdir != NULL);
tracers = tracefs_tracers(tdir);
@@ -424,7 +424,7 @@ static void test_check_events(struct tep_handle *tep, char *system, bool exist)
DIR *dir;
int fd;
- tdir = tracefs_get_tracing_dir();
+ tdir = tracefs_tracing_dir();
CU_TEST(tdir != NULL);
asprintf(&edir, "%s/events/%s", tdir, system);
@@ -461,7 +461,7 @@ static void test_local_events(void)
char *lsystems[3];
int i;
- tdir = tracefs_get_tracing_dir();
+ tdir = tracefs_tracing_dir();
CU_TEST(tdir != NULL);
tep = tracefs_local_events(tdir);
--
2.28.0
|