[1/2] trace-cmd: Rename tracefs_get_tracing_dir() to tracefs_tracing_dir()

Commit Message

Tzvetomir Stoyanov (VMware) Dec. 22, 2020, 5:06 a.m. UTC

The libtracefs API fo locating trace file system mount point is renamed,
use the new API in trace-cmd.

Signed-off-by: Tzvetomir Stoyanov (VMware) <[e-mail]>
---
 include/tracefs/tracefs.h            |  4 ++--
 kernel-shark/src/KsCaptureDialog.cpp |  4 ++--
 lib/trace-cmd/trace-recorder.c       |  6 +++---
 lib/tracefs/tracefs-events.c         |  6 +++---
 lib/tracefs/tracefs-utils.c          |  6 +++---
 tracecmd/trace-check-events.c        |  2 +-
 utest/tracefs-utest.c                | 14 +++++++-------
 7 files changed, 21 insertions(+), 21 deletions(-)

Patch

diff --git a/include/tracefs/tracefs.h b/include/tracefs/tracefs.h
index ce8b09ca..8308e3ac 100644
--- a/include/tracefs/tracefs.h
+++ b/include/tracefs/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);
 
 /* tracefs_find_tracing_dir must be freed */
 char *tracefs_find_tracing_dir(void);
diff --git a/kernel-shark/src/KsCaptureDialog.cpp b/kernel-shark/src/KsCaptureDialog.cpp
index 63fd5d6e..7253ab68 100644
--- a/kernel-shark/src/KsCaptureDialog.cpp
+++ b/kernel-shark/src/KsCaptureDialog.cpp
@@ -26,7 +26,7 @@  extern "C" {
 
 static inline tep_handle *local_events()
 {
-	return tracefs_local_events(tracefs_get_tracing_dir());
+	return tracefs_local_events(tracefs_tracing_dir());
 }
 
 /**
@@ -204,7 +204,7 @@  QStringList KsCaptureControl::_getPlugins()
 	QStringList pluginList;
 	char **all_plugins;
 
-	all_plugins = tracefs_tracers(tracefs_get_tracing_dir());
+	all_plugins = tracefs_tracers(tracefs_tracing_dir());
 
 	if (!all_plugins)
 		return pluginList;
diff --git a/lib/trace-cmd/trace-recorder.c b/lib/trace-cmd/trace-recorder.c
index 6b647d6c..c811028a 100644
--- a/lib/trace-cmd/trace-recorder.c
+++ b/lib/trace-cmd/trace-recorder.c
@@ -307,7 +307,7 @@  struct tracecmd_recorder *tracecmd_create_recorder_fd(int fd, int cpu, unsigned
 {
 	const char *tracing;
 
-	tracing = tracefs_get_tracing_dir();
+	tracing = tracefs_tracing_dir();
 	if (!tracing) {
 		errno = ENODEV;
 		return NULL;
@@ -320,7 +320,7 @@  struct tracecmd_recorder *tracecmd_create_recorder(const char *file, int cpu, un
 {
 	const char *tracing;
 
-	tracing = tracefs_get_tracing_dir();
+	tracing = tracefs_tracing_dir();
 	if (!tracing) {
 		errno = ENODEV;
 		return NULL;
@@ -334,7 +334,7 @@  tracecmd_create_recorder_maxkb(const char *file, int cpu, unsigned flags, int ma
 {
 	const char *tracing;
 
-	tracing = tracefs_get_tracing_dir();
+	tracing = tracefs_tracing_dir();
 	if (!tracing) {
 		errno = ENODEV;
 		return NULL;
diff --git a/lib/tracefs/tracefs-events.c b/lib/tracefs/tracefs-events.c
index ba640a9e..826b6fc7 100644
--- a/lib/tracefs/tracefs-events.c
+++ b/lib/tracefs/tracefs-events.c
@@ -267,7 +267,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;
@@ -341,7 +341,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;
@@ -540,7 +540,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/lib/tracefs/tracefs-utils.c b/lib/tracefs/tracefs-utils.c
index 326b4559..8483cb61 100644
--- a/lib/tracefs/tracefs-utils.c
+++ b/lib/tracefs/tracefs-utils.c
@@ -131,12 +131,12 @@  char *tracefs_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/tracecmd/trace-check-events.c b/tracecmd/trace-check-events.c
index 1dadb046..0fa9082c 100644
--- a/tracecmd/trace-check-events.c
+++ b/tracecmd/trace-check-events.c
@@ -29,7 +29,7 @@  void trace_check_events(int argc, char **argv)
 			break;
 		}
 	}
-	tracing = tracefs_get_tracing_dir();
+	tracing = tracefs_tracing_dir();
 
 	if (!tracing) {
 		printf("Can not find or mount tracing directory!\n"
diff --git a/utest/tracefs-utest.c b/utest/tracefs-utest.c
index e7d637f5..4a622d59 100644
--- a/utest/tracefs-utest.c
+++ b/utest/tracefs-utest.c
@@ -169,7 +169,7 @@  static void test_trace_file(void)
 	CU_TEST(stat(dir, &st) == 0);
 	CU_TEST(S_ISDIR(st.st_mode));
 
-	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));
@@ -192,7 +192,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;
@@ -244,7 +244,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);
@@ -369,7 +369,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);
@@ -402,7 +402,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);
@@ -433,7 +433,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);
@@ -470,7 +470,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);