perf tools: Move path related functions to util/path.h

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Apr 20, 2017 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2017-04-20 11:15 UTC #0 lore raw

Commit-ID:  9a3993d408bc61b839de1a2c6c783477a04860bb
Gitweb:     http://git.kernel.org/tip/9a3993d408bc61b839de1a2c6c783477a04860bb
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 18 Apr 2017 11:33:48 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 19 Apr 2017 13:01:53 -0300

perf tools: Move path related functions to util/path.h

Disentangling util.h header mess a bit more.

Cc Adrian Hunter <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Wang Nan <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/builtin-trace.c                 |  1 +
 tools/perf/tests/mmap-thread-lookup.c      |  1 +
 tools/perf/tests/openat-syscall-all-cpus.c |  4 ++++
 tools/perf/tests/openat-syscall.c          |  3 +++
 tools/perf/ui/setup.c                      |  1 +
 tools/perf/util/build-id.c                 |  1 +
 tools/perf/util/counts.c                   |  1 +
 tools/perf/util/dso.c                      |  1 +
 tools/perf/util/path.c                     | 28 +++++++++++++++++++++++++++-
 tools/perf/util/path.h                     |  9 +++++++++
 tools/perf/util/symbol.c                   |  1 +
 tools/perf/util/symbol.h                   |  2 +-
 tools/perf/util/unwind-libdw.c             |  1 +
 tools/perf/util/util.c                     | 10 ----------
 tools/perf/util/util.h                     | 16 ----------------
 15 files changed, 52 insertions(+), 28 deletions(-)

tools/perf/builtin-trace.c +1 -0

index e065c4a..d1c8cdc 100644
@@ -24,6 +24,7 @@
 #include "util/evlist.h"
 #include <subcmd/exec-cmd.h>
 #include "util/machine.h"
+#include "util/path.h"
 #include "util/session.h"
 #include "util/thread.h"
 #include <subcmd/parse-options.h>

tools/perf/tests/mmap-thread-lookup.c +1 -0

index a5ffb75..6ea4d8a 100644
@@ -12,6 +12,7 @@
 #include "thread_map.h"
 #include "symbol.h"
 #include "thread.h"
+#include "util.h"
 
 #define THREADS 4

tools/perf/tests/openat-syscall-all-cpus.c +4 -0

index b7dece0..1a74dd9 100644
@@ -3,8 +3,12 @@
 /* For the CPU_* macros */
 #include <pthread.h>
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include <api/fs/fs.h>
 #include <linux/err.h>
+#include <api/fs/tracing_path.h>
 #include "evsel.h"
 #include "tests.h"
 #include "thread_map.h"

tools/perf/tests/openat-syscall.c +3 -0

index 5f0c700..e44506e 100644
@@ -2,6 +2,9 @@
 #include <inttypes.h>
 #include <api/fs/tracing_path.h>
 #include <linux/err.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include "thread_map.h"
 #include "evsel.h"
 #include "debug.h"

tools/perf/ui/setup.c +1 -0

index 50d13e58..5ea0b40 100644
@@ -4,6 +4,7 @@
 #include "../util/cache.h"
 #include "../util/debug.h"
 #include "../util/hist.h"
+#include "../util/util.h"
 
 pthread_mutex_t ui__lock = PTHREAD_MUTEX_INITIALIZER;
 void *perf_gtk_handle;

tools/perf/util/build-id.c +1 -0

index f9ccd05..b5c4892 100644
@@ -18,6 +18,7 @@
 #include "tool.h"
 #include "header.h"
 #include "vdso.h"
+#include "path.h"
 #include "probe-file.h"
 #include "strlist.h"

tools/perf/util/counts.c +1 -0

index 83fedd0..c4af82a 100644
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include "evsel.h"
 #include "counts.h"
+#include "util.h"
 
 struct perf_counts *perf_counts__new(int ncpus, int nthreads)
 {

tools/perf/util/dso.c +1 -0

index cd061dc..cbfe17f 100644
@@ -3,6 +3,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <errno.h>
+#include "path.h"
 #include "symbol.h"
 #include "dso.h"
 #include "machine.h"

tools/perf/util/path.c +27 -1

index 7c7630b..50ec3bc 100644
@@ -11,8 +11,13 @@
  * which is what it's designed for.
  */
 #include "cache.h"
-#include "util.h"
+#include "path.h"
+#include <linux/kernel.h>
 #include <limits.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 static char bad_path[] = "/bad-path/";
 /*

@@ -50,3 +55,24 @@ char *mkpath(const char *fmt, ...)
 		return bad_path;
 	return cleanup_path(pathname);
 }
+
+int path__join(char *bf, size_t size, const char *path1, const char *path2)
+{
+	return scnprintf(bf, size, "%s%s%s", path1, path1[0] ? "/" : "", path2);
+}
+
+int path__join3(char *bf, size_t size, const char *path1, const char *path2, const char *path3)
+{
+	return scnprintf(bf, size, "%s%s%s%s%s", path1, path1[0] ? "/" : "",
+			 path2, path2[0] ? "/" : "", path3);
+}
+
+bool is_regular_file(const char *file)
+{
+	struct stat st;
+
+	if (stat(file, &st))
+		return false;
+
+	return S_ISREG(st.st_mode);
+}

tools/perf/util/path.h new file +9 -0

new file mode 100644
index 0000000..9a276a58
@@ -0,0 +1,9 @@
+#ifndef _PERF_PATH_H
+#define _PERF_PATH_H
+
+int path__join(char *bf, size_t size, const char *path1, const char *path2);
+int path__join3(char *bf, size_t size, const char *path1, const char *path2, const char *path3);
+
+bool is_regular_file(const char *file);
+
+#endif /* _PERF_PATH_H */

tools/perf/util/symbol.c +1 -0

index 68f14d7..2cb7665 100644
@@ -19,6 +19,7 @@
 #include "strlist.h"
 #include "intlist.h"
 #include "header.h"
+#include "path.h"
 #include "sane_ctype.h"
 
 #include <elf.h>

tools/perf/util/symbol.h +1 -1

index 5245d2f..7acd70f 100644
@@ -13,7 +13,7 @@
 #include <libgen.h>
 #include "build-id.h"
 #include "event.h"
-#include "util.h"
+#include "path.h"
 
 #ifdef HAVE_LIBELF_SUPPORT
 #include <libelf.h>

tools/perf/util/unwind-libdw.c +1 -0

index 783a53f..f90e11a 100644
@@ -12,6 +12,7 @@
 #include "event.h"
 #include "perf_regs.h"
 #include "callchain.h"
+#include "util.h"
 
 static char *debuginfo_path;

tools/perf/util/util.c +0 ~~-10~~

index 4fb8ee5..64877c6 100644
@@ -713,16 +713,6 @@ out:
 	return tip;
 }
 
-bool is_regular_file(const char *file)
-{
-	struct stat st;
-
-	if (stat(file, &st))
-		return false;
-
-	return S_ISREG(st.st_mode);
-}
-
 int fetch_current_timestamp(char *buf, size_t sz)
 {
 	struct timeval tv;

tools/perf/util/util.h +0 ~~-16~~

index fa8c2e5..6179656 100644
@@ -120,21 +120,6 @@ struct parse_tag {
 
 unsigned long parse_tag_value(const char *str, struct parse_tag *tags);
 
-static inline int path__join(char *bf, size_t size,
-			     const char *path1, const char *path2)
-{
-	return scnprintf(bf, size, "%s%s%s", path1, path1[0] ? "/" : "", path2);
-}
-
-static inline int path__join3(char *bf, size_t size,
-			      const char *path1, const char *path2,
-			      const char *path3)
-{
-	return scnprintf(bf, size, "%s%s%s%s%s",
-			 path1, path1[0] ? "/" : "",
-			 path2, path2[0] ? "/" : "", path3);
-}
-
 int perf_event_paranoid(void);
 
 void mem_bswap_64(void *src, int byte_size);

@@ -162,7 +147,6 @@ int fetch_kernel_version(unsigned int *puint,
 #define KVER_PARAM(x)	KVER_VERSION(x), KVER_PATCHLEVEL(x), KVER_SUBLEVEL(x)
 
 const char *perf_tip(const char *dirpath);
-bool is_regular_file(const char *file);
 int fetch_current_timestamp(char *buf, size_t sz);
 
 #ifndef HAVE_SCHED_GETCPU_SUPPORT