perf tools: Move perf subcommand framework into lib/tools

index 33689a0..044a119 100644
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <sys/epoll.h>
-#include <util/bpf-loader.h>
-#include <util/evlist.h>
+#include "util/bpf-loader.h"
+#include "util/evlist.h"
 #include "tests.h"
 #include "llvm.h"
 #include "debug.h"

index 06f45c1..dc90cea 100644
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <bpf/libbpf.h>
-#include <util/llvm-utils.h>
-#include <util/cache.h>
+#include "util/llvm-utils.h"
+#include "util/cache.h"
 #include "llvm.h"
 #include "tests.h"
 #include "debug.h"

index a0ac031..f0d1035 100644
@@ -7,8 +7,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include "symbol.h"
-#include <strlist.h>
-#include <intlist.h>
+#include "strlist.h"
+#include "intlist.h"
 
 struct thread_stack;
 

new file mode 100644
index 0000000..f472a98
@@ -0,0 +1,130 @@
+#ifndef __PERF_COMPAT_UTIL_H
+#define __PERF_COMPAT_UTIL_H
+
+#ifndef FLEX_ARRAY
+/*
+ * See if our compiler is known to support flexible array members.
+ */
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+# define FLEX_ARRAY /* empty */
+#elif defined(__GNUC__)
+# if (__GNUC__ >= 3)
+#  define FLEX_ARRAY /* empty */
+# else
+#  define FLEX_ARRAY 0 /* older GNU extension */
+# endif
+#endif
+
+/*
+ * Otherwise, default to safer but a bit wasteful traditional style
+ */
+#ifndef FLEX_ARRAY
+# define FLEX_ARRAY 1
+#endif
+#endif
+
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
+
+#ifdef __GNUC__
+#define TYPEOF(x) (__typeof__(x))
+#else
+#define TYPEOF(x)
+#endif
+
+#define MSB(x, bits) ((x) & TYPEOF(x)(~0ULL << (sizeof(x) * 8 - (bits))))
+#define HAS_MULTI_BITS(i)  ((i) & ((i) - 1))  /* checks if an integer has more than 1 bit set */
+
+/* Approximation of the length of the decimal representation of this type. */
+#define decimal_length(x)	((int)(sizeof(x) * 2.56 + 0.5) + 1)
+
+#define _ALL_SOURCE 1
+#define _BSD_SOURCE 1
+/* glibc 2.20 deprecates _BSD_SOURCE in favour of _DEFAULT_SOURCE */
+#define _DEFAULT_SOURCE 1
+#define HAS_BOOL
+
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <sys/statfs.h>
+#include <fcntl.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <errno.h>
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <sys/time.h>
+#include <time.h>
+#include <signal.h>
+#include <fnmatch.h>
+#include <assert.h>
+#include <regex.h>
+#include <utime.h>
+#include <sys/wait.h>
+#include <poll.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <inttypes.h>
+#include <linux/kernel.h>
+#include <linux/magic.h>
+#include <linux/types.h>
+#include <sys/ttydefaults.h>
+#include <api/fs/tracing_path.h>
+#include <termios.h>
+#include <linux/bitops.h>
+#include <termios.h>
+
+/* On most systems <limits.h> would have given us this, but
+ * not on some systems (e.g. GNU/Hurd).
+ */
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
+#ifndef PRIuMAX
+#define PRIuMAX "llu"
+#endif
+
+#ifndef PRIu32
+#define PRIu32 "u"
+#endif
+
+#ifndef PRIx32
+#define PRIx32 "x"
+#endif
+
+#ifndef PATH_SEP
+#define PATH_SEP ':'
+#endif
+
+#ifndef STRIP_EXTENSION
+#define STRIP_EXTENSION ""
+#endif
+
+#ifndef has_dos_drive_prefix
+#define has_dos_drive_prefix(path) 0
+#endif
+
+#ifndef is_dir_sep
+#define is_dir_sep(c) ((c) == '/')
+#endif
+
+#ifdef __GNUC__
+#define NORETURN __attribute__((__noreturn__))
+#else
+#define NORETURN
+#ifndef __attribute__
+#define __attribute__(x)
+#endif
+#endif
+
+#ifndef NSEC_PER_MSEC
+#define NSEC_PER_MSEC	1000000L
+#endif
+
+#endif /* __PERF_COMPAT_UTIL_H */

new file mode 100644
index 0000000..d48c647
@@ -0,0 +1,9 @@
+#ifndef __PERF_CONFIG_H
+#define __PERF_CONFIG_H
+
+#define PERF_GTK_DSO  "libperf-gtk.so"
+
+extern char buildid_dir[];
+extern void set_buildid_dir(const char *dir);
+
+#endif /* __PERF_CONFIG_H */

52 lines not on this page · raw message

index fa1fc4a..29efb03 100644
@@ -114,6 +114,14 @@ static int is_executable(const char *name)
 	return st.st_mode & S_IXUSR;
 }
 
+static int has_extension(const char *filename, const char *ext)
+{
+	size_t len = strlen(filename);
+	size_t extlen = strlen(ext);
+
+	return len > extlen && !memcmp(filename + len - extlen, ext, extlen);
+}
+
 static void list_commands_in_dir(struct cmdnames *cmds,
 					 const char *path,
 					 const char *prefix)

new file mode 100644
index 0000000..ef286e9
@@ -0,0 +1,8 @@
+#ifndef __PERF_LZMA_H
+#define __PERF_LZMA_H
+
+#ifdef HAVE_LZMA_SUPPORT
+int lzma_decompress_to_file(const char *input, int output_fd);
+#endif
+
+#endif /* __PERF_LZMA_H */

index 9fca092..29366ae 100644
@@ -9,6 +9,12 @@
 
 static struct strbuf error_buf = STRBUF_INIT;
 
+static const char *skip_prefix(const char *str, const char *prefix)
+{
+	size_t len = strlen(prefix);
+	return strncmp(str, prefix, len) ? NULL : str + len;
+}
+
 static int opterror(const struct option *opt, const char *reason, int flags)
 {
 	if (flags & OPT_SHORT)

new file mode 100644
index 0000000..ef57dc5
@@ -0,0 +1,16 @@
+#ifndef __PERF_SRCLINE_H
+#define __PERF_SRCLINE_H
+
+#define SRCLINE_UNKNOWN  ((char *) "??:0")
+
+struct dso;
+struct symbol;
+
+extern bool srcline_full_filename;
+char *get_srcline(struct dso *dso, u64 addr, struct symbol *sym,
+		  bool show_sym);
+char *__get_srcline(struct dso *dso, u64 addr, struct symbol *sym,
+		  bool show_sym, bool unwind_inlines);
+void free_srcline(char *srcline);
+
+#endif /* __PERF_SRCLINE_H */

index 529f2f0..39a1481 100644
@@ -50,6 +50,8 @@ struct strbuf {
 
 #define STRBUF_INIT  { 0, 0, strbuf_slopbuf }
 
+extern int prefixcmp(const char *str, const char *prefix);
+
 /*----- strbuf life cycle -----*/
 extern void strbuf_init(struct strbuf *buf, ssize_t hint);
 extern void strbuf_release(struct strbuf *);

new file mode 100644
index 0000000..d124268
@@ -0,0 +1,34 @@
+#ifndef __PERF_STRING_H
+#define __PERF_STRING_H
+
+s64 perf_atoll(const char *str);
+char **argv_split(const char *str, int *argcp);
+void argv_free(char **argv);
+bool strglobmatch(const char *str, const char *pat);
+bool strlazymatch(const char *str, const char *pat);
+static inline bool strisglob(const char *str)
+{
+	return strpbrk(str, "*?[") != NULL;
+}
+int strtailcmp(const char *s1, const char *s2);
+char *strxfrchar(char *s, char from, char to);
+
+#define _STR(x) #x
+#define STR(x) _STR(x)
+
+char *ltrim(char *s);
+char *rtrim(char *s);
+
+char *asprintf_expr_inout_ints(const char *var, bool in, size_t nints, int *ints);
+
+static inline char *asprintf_expr_in_ints(const char *var, size_t nints, int *ints)
+{
+	return asprintf_expr_inout_ints(var, true, nints, ints);
+}
+
+static inline char *asprintf_expr_not_in_ints(const char *var, size_t nints, int *ints)
+{
+	return asprintf_expr_inout_ints(var, false, nints, ints);
+}
+
+#endif /* __PERF_STRING_H */

new file mode 100644
index 0000000..e3f1bd0
@@ -0,0 +1,23 @@
+#ifndef __PERF_USAGE_H
+#define __PERF_USAGE_H
+
+#include "compat-util.h"
+
+extern void usage(const char *err) NORETURN;
+extern void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));
+extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
+extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
+
+#include "../../../include/linux/stringify.h"
+
+#define DIE_IF(cnd)	\
+	do { if (cnd)	\
+		die(" at (" __FILE__ ":" __stringify(__LINE__) "): "	\
+		    __stringify(cnd) "\n");				\
+	} while (0)
+
+
+extern void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN);
+extern void set_warning_routine(void (*routine)(const char *err, va_list params));
+
+#endif /* __PERF_USAGE_H */

346 lines not on this page · raw message

new file mode 100644
index 0000000..510781b
@@ -0,0 +1,14 @@
+#ifndef __PERF_WRAPPER_H
+#define __PERF_WRAPPER_H
+
+extern char *xstrdup(const char *str);
+extern void *xrealloc(void *ptr, size_t size) __attribute__((weak));
+
+static inline void *zalloc(size_t size)
+{
+	return calloc(1, size);
+}
+
+#define zfree(ptr) ({ free(*ptr); *ptr = NULL; })
+
+#endif /* __PERF_WRAPPER_H */

new file mode 100644
index 0000000..40ee6d8
@@ -0,0 +1,8 @@
+#ifndef __PERF_ZLIB_H
+#define __PERF_ZLIB_H
+
+#ifdef HAVE_ZLIB_SUPPORT
+int gzip_decompress_to_file(const char *input, int output_fd);
+#endif
+
+#endif /* __PERF_ZLIB_H */

new file mode 100644
index 0000000..90b47d8
@@ -0,0 +1,35 @@
+#include "util.h"
+
+void get_term_dimensions(struct winsize *ws)
+{
+	char *s = getenv("LINES");
+
+	if (s != NULL) {
+		ws->ws_row = atoi(s);
+		s = getenv("COLUMNS");
+		if (s != NULL) {
+			ws->ws_col = atoi(s);
+			if (ws->ws_row && ws->ws_col)
+				return;
+		}
+	}
+#ifdef TIOCGWINSZ
+	if (ioctl(1, TIOCGWINSZ, ws) == 0 &&
+	    ws->ws_row && ws->ws_col)
+		return;
+#endif
+	ws->ws_row = 25;
+	ws->ws_col = 80;
+}
+
+void set_term_quiet_input(struct termios *old)
+{
+	struct termios tc;
+
+	tcgetattr(0, old);
+	tc = *old;
+	tc.c_lflag &= ~(ICANON | ECHO);
+	tc.c_cc[VMIN] = 0;
+	tc.c_cc[VTIME] = 0;
+	tcsetattr(0, TCSANOW, &tc);
+}

new file mode 100644
index 0000000..7b13f46
@@ -0,0 +1,7 @@
+#ifndef __PERF_TERM_H
+#define __PERF_TERM_H
+
+void get_term_dimensions(struct winsize *ws);
+void set_term_quiet_input(struct termios *old);
+
+#endif /* __PERF_TERM_H */

index 75759ae..07da970 100644
@@ -355,40 +355,6 @@ void sighandler_dump_stack(int sig)
 	exit(sig);
 }
 
-void get_term_dimensions(struct winsize *ws)
-{
-	char *s = getenv("LINES");
-
-	if (s != NULL) {
-		ws->ws_row = atoi(s);
-		s = getenv("COLUMNS");
-		if (s != NULL) {
-			ws->ws_col = atoi(s);
-			if (ws->ws_row && ws->ws_col)
-				return;
-		}
-	}
-#ifdef TIOCGWINSZ
-	if (ioctl(1, TIOCGWINSZ, ws) == 0 &&
-	    ws->ws_row && ws->ws_col)
-		return;
-#endif
-	ws->ws_row = 25;
-	ws->ws_col = 80;
-}
-
-void set_term_quiet_input(struct termios *old)
-{
-	struct termios tc;
-
-	tcgetattr(0, old);
-	tc = *old;
-	tc.c_lflag &= ~(ICANON | ECHO);
-	tc.c_cc[VMIN] = 0;
-	tc.c_cc[VTIME] = 0;
-	tcsetattr(0, TCSANOW, &tc);
-}
-
 int parse_nsec_time(const char *str, u64 *ptime)
 {
 	u64 time_sec, time_nsec;

index cd0d9b0..d8e3d8d 100644
@@ -9,6 +9,7 @@
 #include "srcline.h"
 #include "strbuf.h"
 #include "string.h"
+#include "term.h"
 #include "usage.h"
 #include "wrapper.h"
 #include "zlib.h"

@@ -38,9 +39,6 @@ void sighandler_dump_stack(int sig);
 extern unsigned int page_size;
 extern int cacheline_size;
 
-void get_term_dimensions(struct winsize *ws);
-void set_term_quiet_input(struct termios *old);
-
 struct parse_tag {
 	char tag;
 	int mult;

index c861373..4c2b764 100644
@@ -31,7 +31,6 @@ extern const char *perf_config_dirname(const char *, const char *);
 /* pager.c */
 extern void setup_pager(void);
 extern int pager_in_use(void);
-extern int pager_use_color;
 
 char *alias_lookup(const char *alias);
 int split_cmdline(char *cmdline, const char ***argv);

index 9b95654..e5fb88b 100644
@@ -24,7 +24,7 @@ int perf_config_colorbool(const char *var, const char *value, int stdout_is_tty)
  auto_color:
 	if (stdout_is_tty < 0)
 		stdout_is_tty = isatty(1);
-	if (stdout_is_tty || (pager_in_use() && pager_use_color)) {
+	if (stdout_is_tty || pager_in_use()) {
 		char *term = getenv("TERM");
 		if (term && strcmp(term, "dumb"))
 			return 1;

deleted file mode 100644
index 7405123..0000000
@@ -1,8 +0,0 @@
-/*
- * We put all the perf config variables in this same object
- * file, so that programs can link against the config parser
- * without having to link against all the rest of perf.
- */
-#include "cache.h"
-
-int pager_use_color = 1;

index 90129ac..501acb4 100644
@@ -6,6 +6,18 @@
 #include <linux/types.h>
 #include <linux/perf_event.h>
 
+#define CMD_EXEC_PATH "--exec-path"
+#define CMD_PERF_DIR "--perf-dir="
+#define CMD_WORK_TREE "--work-tree="
+#define CMD_DEBUGFS_DIR "--debugfs-dir="
+
+#define PERF_DIR_ENVIRONMENT "PERF_DIR"
+#define PERF_WORK_TREE_ENVIRONMENT "PERF_WORK_TREE"
+#define EXEC_PATH_ENVIRONMENT "PERF_EXEC_PATH"
+#define DEFAULT_PERF_DIR_ENVIRONMENT ".perf"
+#define PERF_DEBUGFS_ENVIRONMENT "PERF_DEBUGFS_DIR"
+#define PERF_TRACEFS_ENVIRONMENT "PERF_TRACEFS_DIR"
+
 extern bool test_attr__enabled;
 void test_attr__init(void);
 void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu,

new file mode 100644
index 0000000..13549fb
@@ -0,0 +1,11 @@
+#ifndef __PERF_ABSPATH_H
+#define __PERF_ABSPATH_H
+
+static inline int is_absolute_path(const char *path)
+{
+	return path[0] == '/';
+}
+
+const char *make_nonrelative_path(const char *path);
+
+#endif /* __PERF_ABSPATH_H */

new file mode 100644
index 0000000..23d4f84
@@ -0,0 +1,7 @@
+#ifndef __PERF_ALIAS_H
+#define __PERF_ALIAS_H
+
+char *alias_lookup(const char *alias);
+int split_cmdline(char *cmdline, const char ***argv);
+
+#endif /* __PERF_ALIAS_H */

77 lines not on this page · raw message

index d48c647..8e53f6f 100644
@@ -6,4 +6,13 @@
 extern char buildid_dir[];
 extern void set_buildid_dir(const char *dir);
 
+typedef int (*config_fn_t)(const char *, const char *, void *);
+extern int perf_default_config(const char *, const char *, void *);
+extern int perf_config(config_fn_t fn, void *);
+extern int perf_config_int(const char *, const char *);
+extern u64 perf_config_u64(const char *, const char *);
+extern int perf_config_bool(const char *, const char *);
+extern int config_error_nonbool(const char *);
+extern const char *perf_config_dirname(const char *, const char *);
+
 #endif /* __PERF_CONFIG_H */

new file mode 100644
index 0000000..2794a83
@@ -0,0 +1,7 @@
+#ifndef __PERF_PAGER_H
+#define __PERF_PAGER_H
+
+extern void setup_pager(void);
+extern int pager_in_use(void);
+
+#endif /* __PERF_PAGER_H */

new file mode 100644
index 0000000..3604e82f
@@ -0,0 +1,17 @@
+#ifndef __PERF_PATH_H
+#define __PERF_PATH_H
+
+char *strip_path_suffix(const char *path, const char *suffix);
+
+extern char *mkpath(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
+extern char *perf_path(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
+
+extern char *perf_pathdup(const char *fmt, ...)
+	__attribute__((format (printf, 1, 2)));
+
+#ifndef __UCLIBC__
+/* Matches the libc/libbsd function attribute so we declare this unconditionally: */
+extern size_t strlcpy(char *dest, const char *src, size_t size);
+#endif
+
+#endif /* __PERF_PATH_H */

index 510781b..e2fa014 100644
@@ -11,4 +11,24 @@ static inline void *zalloc(size_t size)
 
 #define zfree(ptr) ({ free(*ptr); *ptr = NULL; })
 
+#define alloc_nr(x) (((x)+16)*3/2)
+
+/*
+ * Realloc the buffer pointed at by variable 'x' so that it can hold
+ * at least 'nr' entries; the number of entries currently allocated
+ * is 'alloc', using the standard growing factor alloc_nr() macro.
+ *
+ * DO NOT USE any expression with side-effect for 'x' or 'alloc'.
+ */
+#define ALLOC_GROW(x, nr, alloc) \
+	do { \
+		if ((nr) > alloc) { \
+			if (alloc_nr(alloc) < (nr)) \
+				alloc = (nr); \
+			else \
+				alloc = alloc_nr(alloc); \
+			x = xrealloc((x), alloc * sizeof(*(x))); \
+		} \
+	} while(0)
+
 #endif /* __PERF_WRAPPER_H */

index 2bf9b3f..50695c7 100644
@@ -10,7 +10,6 @@
 #include "util/util.h"
 #include "util/color.h"
 #include <linux/list.h>
-#include "util/cache.h"
 #include <linux/rbtree.h>
 #include "util/symbol.h"
 

index 7b8450c..bed484f 100644
@@ -13,7 +13,7 @@
 #include <unistd.h>
 #include "builtin.h"
 #include "perf.h"
-#include "util/cache.h"
+#include "util/util.h"
 #include "util/debug.h"
 #include "util/header.h"
 #include "util/parse-options.h"

index 918b4de..bd7558e 100644
@@ -10,7 +10,7 @@
 #include "builtin.h"
 #include "perf.h"
 #include "util/build-id.h"
-#include "util/cache.h"
+#include "util/util.h"
 #include "util/debug.h"
 #include "util/parse-options.h"
 #include "util/session.h"

index 427ea7a..03117c8 100644
@@ -8,9 +8,8 @@
 
 #include "perf.h"
 
-#include "util/cache.h"
-#include "util/parse-options.h"
 #include "util/util.h"
+#include "util/parse-options.h"
 #include "util/debug.h"
 
 static const char * const config_usage[] = {

index a7d588b..23c3fdb 100644
@@ -4,7 +4,7 @@
  * Builtin help command
  */
 #include "perf.h"
-#include "util/cache.h"
+#include "util/util.h"
 #include "builtin.h"
 #include "util/exec_cmd.h"
 #include "common-cmds.h"

index 93ce665..1c3d3d9 100644
@@ -4,7 +4,6 @@
 #include "util/evlist.h"
 #include "util/evsel.h"
 #include "util/util.h"
-#include "util/cache.h"
 #include "util/symbol.h"
 #include "util/thread.h"
 #include "util/header.h"

index dd94b4c..a9ad326 100644
@@ -4,7 +4,6 @@
 #include "util/evsel.h"
 #include "util/evlist.h"
 #include "util/util.h"
-#include "util/cache.h"
 #include "util/symbol.h"
 #include "util/thread.h"
 #include "util/header.h"

index bf679e2..70856ac 100644
@@ -12,7 +12,7 @@
 #include "perf.h"
 
 #include "util/parse-events.h"
-#include "util/cache.h"
+#include "util/util.h"
 #include "util/pmu.h"
 #include "util/parse-options.h"
 

index de16aae..191d32f 100644
@@ -4,7 +4,6 @@
 #include "util/evlist.h"
 #include "util/evsel.h"
 #include "util/util.h"
-#include "util/cache.h"
 #include "util/symbol.h"
 #include "util/thread.h"
 #include "util/header.h"

index af5db88..61ed8f2 100644
@@ -8,7 +8,6 @@
 #include "builtin.h"
 
 #include "util/util.h"
-#include "util/cache.h"
 
 #include "util/annotate.h"
 #include "util/color.h"

index e3d3e32..43dedd4 100644
@@ -3,7 +3,6 @@
 
 #include "util/util.h"
 #include "util/evlist.h"
-#include "util/cache.h"
 #include "util/evsel.h"
 #include "util/symbol.h"
 #include "util/thread.h"

index 3c3f8d0..8873021 100644
@@ -1,7 +1,6 @@
 #include "builtin.h"
 
 #include "perf.h"
-#include "util/cache.h"
 #include "util/debug.h"
 #include "util/exec_cmd.h"
 #include "util/header.h"

index 30e5962..ab75e5b 100644
@@ -20,7 +20,6 @@
 
 #include "util/color.h"
 #include <linux/list.h>
-#include "util/cache.h"
 #include "util/evlist.h"
 #include "util/evsel.h"
 #include <linux/rbtree.h>

index 7e2e72e..c8dd628 100644
@@ -22,7 +22,6 @@
 #include "perf.h"
 
 #include "util/annotate.h"
-#include "util/cache.h"
 #include "util/color.h"
 #include "util/evlist.h"
 #include "util/evsel.h"

index 4bee53c..bcf4fab 100644
@@ -10,7 +10,7 @@
 
 #include "util/env.h"
 #include "util/exec_cmd.h"
-#include "util/cache.h"
+#include "util/util.h"
 #include "util/quote.h"
 #include "util/run-command.h"
 #include "util/parse-events.h"

index dc90cea..fdb7e84 100644
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <bpf/libbpf.h>
 #include "util/llvm-utils.h"
-#include "util/cache.h"
+#include "util/util.h"
 #include "llvm.h"
 #include "tests.h"
 #include "debug.h"

index e9703c0..97b570d 100644
@@ -1,5 +1,4 @@
 #include "../util.h"
-#include "../cache.h"
 #include "../../perf.h"
 #include "libslang.h"
 #include "ui.h"

index edbeaaf..d4c9fac 100644
@@ -1,4 +1,4 @@
-#include "util/cache.h"
+#include "util/util.h"
 #include "util/debug.h"
 #include "ui/browser.h"
 #include "ui/keysyms.h"

index c24d912..4305b1b 100644
@@ -1,5 +1,5 @@
 #include "../evlist.h"
-#include "../cache.h"
+#include "../util.h"
 #include "../evsel.h"
 #include "../sort.h"
 #include "../hist.h"

index 4677172..9f3db1f 100644
@@ -1,5 +1,5 @@
 #include "../evlist.h"
-#include "../cache.h"
+#include "../util.h"
 #include "../evsel.h"
 #include "../sort.h"
 #include "../hist.h"

index 1d57676..562a800 100644
@@ -1,5 +1,5 @@
 #include "gtk.h"
-#include "../../util/cache.h"
+#include "../../util/util.h"
 #include "../../util/debug.h"
 
 extern struct perf_error_ops perf_gtk_eops;

index 46181f4..66901b2 100644
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "../util/cache.h"
+#include "../util/util.h"
 
 struct ui_helpline {
 	void (*pop)(void);

index a0f24c7..8857f99 100644
@@ -1,4 +1,4 @@
-#include "../cache.h"
+#include "../util.h"
 #include "progress.h"
 
 static void null_progress__update(struct ui_progress *p __maybe_unused)

index ba51fa8..df4bd94 100644
@@ -1,7 +1,7 @@
 #include <pthread.h>
 #include <dlfcn.h>
 
-#include "../util/cache.h"
+#include "../util/util.h"
 #include "../util/debug.h"
 #include "../util/hist.h"
 

index c4b9900..89df2eb 100644
@@ -1,4 +1,4 @@
-#include "../cache.h"
+#include "../util.h"
 #include "../progress.h"
 #include "../libslang.h"
 #include "../ui.h"

index 7dfeba0..b498733 100644
@@ -4,7 +4,6 @@
 #include <execinfo.h>
 #endif
 
-#include "../../util/cache.h"
 #include "../../util/debug.h"
 #include "../browser.h"
 #include "../helpline.h"

index d96ad7c..c2de719 100644
@@ -4,7 +4,6 @@
 #include <string.h>
 #include <sys/ttydefaults.h>
 
-#include "../../util/cache.h"
 #include "../../util/debug.h"
 #include "../browser.h"
 #include "../keysyms.h"

index 0e76aff..eab5d85 100644
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "util.h"
 
 static const char *get_pwd_cwd(void)
 {

index c0b43ee..f905664 100644
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "util.h"
 
 static const char *alias_key;
 static char *alias_val;

index 1dd1949..2ab2407 100644
@@ -12,7 +12,6 @@
 #include "sort.h"
 #include "build-id.h"
 #include "color.h"
-#include "cache.h"
 #include "symbol.h"
 #include "debug.h"
 #include "annotate.h"

deleted file mode 100644
index 32e1f52..0000000
@@ -1,16 +0,0 @@
-#ifndef __PERF_CACHE_H
-#define __PERF_CACHE_H
-
-#include <stdbool.h>
-#include "util.h"
-#include "strbuf.h"
-#include "../perf.h"
-#include "../ui/ui.h"
-
-#include "abspath.h"
-#include "alias.h"
-#include "config.h"
-#include "pager.h"
-#include "path.h"
-
-#endif /* __PERF_CACHE_H */

index e5fb88b..f436c12 100644
@@ -1,5 +1,5 @@
 #include <linux/kernel.h>
-#include "cache.h"
+#include "util.h"
 #include "color.h"
 #include <math.h>
 

index 2e452ac..6b9e91f 100644
@@ -9,7 +9,6 @@
  *
  */
 #include "util.h"
-#include "cache.h"
 #include "exec_cmd.h"
 #include "util/hist.h"  /* perf_hist_config */
 #include "util/llvm-utils.h"   /* perf_llvm_config */

index 86d9c73..8931f4e 100644
@@ -6,7 +6,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "cache.h"
 #include "color.h"
 #include "event.h"
 #include "debug.h"

index 1099e92..8d5661e 100644
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "util.h"
 #include "exec_cmd.h"
 #include "quote.h"
 

index 29efb03..2d5e304 100644
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "util.h"
 #include "../builtin.h"
 #include "exec_cmd.h"
 #include "levenshtein.h"

index 9409d01..697ed0a 100644
@@ -23,7 +23,6 @@
 #include <stdint.h>
 #include <inttypes.h>
 
-#include "../cache.h"
 #include "../util.h"
 
 #include "intel-pt-insn-decoder.h"

index e521d15..61bb371 100644
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "util.h"
 #include "levenshtein.h"
 
 /*

index 00724d4..5f02deb 100644
@@ -7,7 +7,6 @@
 #include "util.h"
 #include "debug.h"
 #include "llvm-utils.h"
-#include "cache.h"
 
 #define CLANG_BPF_CMD_DEFAULT_TEMPLATE				\
 		"$CLANG_EXEC -D__KERNEL__ -D__NR_CPUS__=$NR_CPUS "\

index 53ef006..bb19546 100644
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "util.h"
 #include "run-command.h"
 #include "sigchain.h"
 

index 6fc8cd7..d2ec59d 100644
@@ -9,7 +9,6 @@
 #include "exec_cmd.h"
 #include "string.h"
 #include "symbol.h"
-#include "cache.h"
 #include "header.h"
 #include "bpf-loader.h"
 #include "debug.h"

index 29366ae..9937e91 100644
@@ -1,6 +1,5 @@
 #include "util.h"
 #include "parse-options.h"
-#include "cache.h"
 #include "header.h"
 #include <linux/string.h>
 

index 5d13cb4..1e22ac0 100644
@@ -10,7 +10,7 @@
  *
  * which is what it's designed for.
  */
-#include "cache.h"
+#include "util.h"
 
 static char bad_path[] = "/bad-path/";
 /*

index 93996ec..388fec5 100644
@@ -36,7 +36,6 @@
 #include "event.h"
 #include "strlist.h"
 #include "debug.h"
-#include "cache.h"
 #include "color.h"
 #include "symbol.h"
 #include "thread.h"

index e3b3b92..724a6ce 100644
@@ -18,7 +18,6 @@
 #include "event.h"
 #include "strlist.h"
 #include "debug.h"
-#include "cache.h"
 #include "color.h"
 #include "symbol.h"
 #include "thread.h"

index 01f0324..57ed644 100644
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "util.h"
 #include "quote.h"
 
 /* Help to copy the thing properly quoted for the shell safety.

index 34622b5..38d2cc6 100644
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "util.h"
 #include "run-command.h"
 #include "exec_cmd.h"
 #include "debug.h"

index ba785e9..5eebf88 100644
@@ -1,5 +1,5 @@
+#include "util.h"
 #include "sigchain.h"
-#include "cache.h"
 
 #define SIGCHAIN_MAX_SIGNALS 32
 

index 3122885..139a566 100644
@@ -6,7 +6,6 @@
 
 #include "color.h"
 #include <linux/list.h>
-#include "cache.h"
 #include <linux/rbtree.h>
 #include "symbol.h"
 #include "string.h"

index 25671fa..0e53793 100644
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "util.h"
 #include <linux/kernel.h>
 
 int prefixcmp(const char *str, const char *prefix)

index d8e3d8d..c7b50d5 100644
@@ -3,13 +3,19 @@
 
 #include "compat-util.h"
 
+#include "../perf.h"
+#include "abspath.h"
+#include "alias.h"
 #include "config.h"
 #include "ctype.h"
 #include "lzma.h"
+#include "pager.h"
+#include "path.h"
 #include "srcline.h"
 #include "strbuf.h"
 #include "string.h"
 #include "term.h"
+#include "../ui/ui.h"
 #include "usage.h"
 #include "wrapper.h"
 #include "zlib.h"

index 19f15b6..861ecfa 100644
@@ -1,7 +1,7 @@
 /*
  * Various trivial helper wrappers around standard functions
  */
-#include "cache.h"
+#include "util.h"
 
 /*
  * There's no pack memory to release - but stay close to the Git

index bcf4fab..c57e447 100644
@@ -384,6 +384,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 		use_pager = 1;
 	commit_pager_choice();
 
+	perf_env__set_cmdline(&perf_env, argc, argv);
 	status = p->fn(argc, argv, prefix);
 	exit_browser(status);
 	perf_env__exit(&perf_env);

index 6af4f7c..7dd5939 100644
@@ -25,15 +25,6 @@ int perf_env__set_cmdline(struct perf_env *env, int argc, const char *argv[])
 {
 	int i;
 
-	/*
-	 * If env->cmdline_argv has already been set, do not override it.  This allows
-	 * a command to set the cmdline, parse args and then call another
-	 * builtin function that implements a command -- e.g, cmd_kvm calling
-	 * cmd_record.
-	 */
-	if (env->cmdline_argv != NULL)
-		return 0;
-
 	/* do not include NULL termination */
 	env->cmdline_argv = calloc(argc, sizeof(char *));
 	if (env->cmdline_argv == NULL)

index 9937e91..735c8c8 100644
@@ -506,8 +506,6 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o
 {
 	struct parse_opt_ctx_t ctx;
 
-	perf_env__set_cmdline(&perf_env, argc, argv);
-
 	/* build usage string if it's not provided */
 	if (subcommands && !usagestr[0]) {
 		struct strbuf buf = STRBUF_INIT;

index bb19546..6cff2ac 100644
@@ -85,11 +85,5 @@ void setup_pager(void)
 
 int pager_in_use(void)
 {
-	const char *env;
-
-	if (spawned_pager)
-		return 1;
-
-	env = getenv("PERF_PAGER_IN_USE");
-	return env ? perf_config_bool("PERF_PAGER_IN_USE", env) : 0;
+	return spawned_pager;
 }

new file mode 100644
index 0000000..0587ec6
@@ -0,0 +1,9 @@
+#include "util/util.h"
+#include "builtin.h"
+
+int cmd_version(int argc __maybe_unused, const char **argv __maybe_unused,
+		const char *prefix __maybe_unused)
+{
+	printf("perf version %s\n", perf_version_string);
+	return 0;
+}

index 2d5e304..573ce05 100644
@@ -340,10 +340,3 @@ const char *help_unknown_cmd(const char *cmd)
 
 	exit(1);
 }
-
-int cmd_version(int argc __maybe_unused, const char **argv __maybe_unused,
-		const char *prefix __maybe_unused)
-{
-	printf("perf version %s\n", perf_version_string);
-	return 0;
-}

103 lines not on this page · raw message

new file mode 100644
index 0000000..e69de29

135 lines not on this page · raw message

index 7f5c6de..14851b0 100644
@@ -20,6 +20,9 @@ void load_command_list(const char *prefix,
 		struct cmdnames *main_cmds,
 		struct cmdnames *other_cmds);
 void add_cmdname(struct cmdnames *cmds, const char *name, size_t len);
+void clean_cmdnames(struct cmdnames *cmds);
+int cmdname_compare(const void *a, const void *b);
+void uniq(struct cmdnames *cmds);
 /* Here we require that excludes is a sorted list. */
 void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes);
 int is_in_cmdlist(struct cmdnames *c, const char *s);

index 2e2f736..eae1d87 100644
@@ -8,4 +8,9 @@ void *memdup(const void *src, size_t len);
 
 int strtobool(const char *s, bool *res);
 
+#ifndef __UCLIBC__
+/* Matches the libc/libbsd function attribute so we declare this unconditionally: */
+extern size_t strlcpy(char *dest, const char *src, size_t size);
+#endif
+
 #endif /* _LINUX_STRING_H_ */

index 065e54f..3366582 100644
@@ -16,6 +16,7 @@
 #include <string.h>
 #include <errno.h>
 #include <linux/string.h>
+#include <linux/compiler.h>
 
 /**
  * memdup - duplicate region of memory

@@ -60,3 +61,21 @@ int strtobool(const char *s, bool *res)
 	}
 	return 0;
 }
+
+/*
+ * If libc has strlcpy() then that version will override this
+ * implementation:
+ */
+size_t __weak strlcpy(char *dest, const char *src, size_t size)
+{
+	size_t ret = strlen(src);
+
+	if (size) {
+		size_t len = (ret >= size) ? size - 1 : ret;
+
+		memcpy(dest, src, len);
+		dest[len] = '\0';
+	}
+
+	return ret;
+}

index 1e22ac0..416fe7d 100644
@@ -22,24 +22,6 @@ static const char *get_perf_dir(void)
 	return ".";
 }
 
-/*
- * If libc has strlcpy() then that version will override this
- * implementation:
- */
-size_t __weak strlcpy(char *dest, const char *src, size_t size)
-{
-	size_t ret = strlen(src);
-
-	if (size) {
-		size_t len = (ret >= size) ? size - 1 : ret;
-
-		memcpy(dest, src, len);
-		dest[len] = '\0';
-	}
-
-	return ret;
-}
-
 static char *get_pathname(void)
 {
 	static char pathname_array[4][PATH_MAX];

index 3604e82f..1df12e7 100644
@@ -9,9 +9,4 @@ extern char *perf_path(const char *fmt, ...) __attribute__((format (printf, 1, 2
 extern char *perf_pathdup(const char *fmt, ...)
 	__attribute__((format (printf, 1, 2)));
 
-#ifndef __UCLIBC__
-/* Matches the libc/libbsd function attribute so we declare this unconditionally: */
-extern size_t strlcpy(char *dest, const char *src, size_t size);
-#endif
-
 #endif /* __PERF_PATH_H */

index c7b50d5..2c6db35 100644
@@ -3,6 +3,7 @@
 
 #include "compat-util.h"
 
+#include <linux/string.h>
 #include "../perf.h"
 #include "abspath.h"
 #include "alias.h"

similarity index 93%
rename from tools/lib/string.c
rename to tools/lib/api/string/string.c
index 3366582..3140ba3 100644
@@ -1,5 +1,5 @@
 /*
- *  linux/tools/lib/string.c
+ *  linux/tools/lib/api/string/string.c
  *
  *  Copied from linux/lib/string.c, where it is:
  *

@@ -15,8 +15,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <linux/string.h>
-#include <linux/compiler.h>
+#include "string.h"
+
+#define __weak __attribute__((weak))
 
 /**
  * memdup - duplicate region of memory

similarity index 66%
rename from tools/include/linux/string.h
rename to tools/lib/api/string/string.h
index eae1d87..74bd4fd 100644
@@ -1,8 +1,8 @@
-#ifndef _TOOLS_LINUX_STRING_H_
-#define _TOOLS_LINUX_STRING_H_
+#ifndef _API_STRING_H
+#define _API_STRING_H
 
-
-#include <linux/types.h>	/* for size_t */
+#include <stddef.h>
+#include <stdbool.h>
 
 void *memdup(const void *src, size_t len);
 

@@ -13,4 +13,4 @@ int strtobool(const char *s, bool *res);
 extern size_t strlcpy(char *dest, const char *src, size_t size);
 #endif
 
-#endif /* _LINUX_STRING_H_ */
+#endif /* _API_STRING_H */

index 1c3d3d9..cdf487b 100644
@@ -19,7 +19,7 @@
 #include "util/debug.h"
 
 #include <linux/rbtree.h>
-#include <linux/string.h>
+#include <api/string/string.h>
 #include <locale.h>
 #include <regex.h>
 

index 7f10430..cc83262 100644
@@ -22,7 +22,7 @@
 #include <linux/types.h>
 #include <linux/bitops.h>
 #include <linux/log2.h>
-#include <linux/string.h>
+#include <api/string/string.h>
 
 #include <sys/param.h>
 #include <stdlib.h>

index 540a7ef..5a99b6a 100644
@@ -8,7 +8,7 @@
 #include <linux/bpf.h>
 #include <bpf/libbpf.h>
 #include <linux/err.h>
-#include <linux/string.h>
+#include <api/string/string.h>
 #include "perf.h"
 #include "debug.h"
 #include "bpf-loader.h"

index 47314a6..bcf3a8e 100644
@@ -19,7 +19,7 @@
  */
 
 #ifdef __KERNEL__
-#include <linux/string.h>
+#include <api/string/string.h>
 #else
 #include <string.h>
 #endif

index 93d9f1c..c9f716d 100644
@@ -14,7 +14,7 @@
 #include "util.h"
 #include "debug.h"
 #include "machine.h"
-#include <linux/string.h>
+#include <api/string/string.h>
 
 static void __maps__insert(struct maps *maps, struct map *map);
 

index b1b9e23..867ae98 100644
@@ -1,6 +1,6 @@
 #include <linux/list.h>
 #include <linux/compiler.h>
-#include <linux/string.h>
+#include <api/string/string.h>
 #include "ordered-events.h"
 #include "session.h"
 #include "asm/bug.h"

index 735c8c8..8d70c1b 100644
@@ -1,7 +1,7 @@
 #include "util.h"
 #include "parse-options.h"
 #include "header.h"
-#include <linux/string.h>
+#include <api/string/string.h>
 
 #define OPT_SHORT 1
 #define OPT_UNSET 2

index 2c6db35..f1c07f6 100644
@@ -3,7 +3,7 @@
 
 #include "compat-util.h"
 
-#include <linux/string.h>
+#include <api/string/string.h>
 #include "../perf.h"
 #include "abspath.h"
 #include "alias.h"

index 2218b9a..494c9c6 100644
@@ -1 +1 @@
-#include <../../../../include/asm-generic/bitops/__fls.h>
+#include "../../../../include/asm-generic/bitops/__fls.h"

index dbf711a..0e4995f 100644
@@ -1 +1 @@
-#include <../../../../include/asm-generic/bitops/fls.h>
+#include "../../../../include/asm-generic/bitops/fls.h"

index 980b1f6..35bee00 100644
@@ -1 +1 @@
-#include <../../../../include/asm-generic/bitops/fls64.h>
+#include "../../../../include/asm-generic/bitops/fls64.h"

similarity index 90%
rename from tools/perf/util/abspath.c
rename to tools/lib/api/util/abspath.c
index eab5d85..9827a3f 100644
@@ -1,4 +1,8 @@
-#include "util.h"
+#include "compat-util.h"
+
+#include "../string/string.h"
+#include "abspath.h"
+#include "usage.h"
 
 static const char *get_pwd_cwd(void)
 {

similarity index 59%
rename from tools/perf/util/abspath.h
rename to tools/lib/api/util/abspath.h
index 13549fb..fa5d82a 100644
@@ -1,5 +1,5 @@
-#ifndef __PERF_ABSPATH_H
-#define __PERF_ABSPATH_H
+#ifndef __API_UTIL_ABSPATH_H
+#define __API_UTIL_ABSPATH_H
 
 static inline int is_absolute_path(const char *path)
 {

@@ -8,4 +8,4 @@ static inline int is_absolute_path(const char *path)
 
 const char *make_nonrelative_path(const char *path);
 
-#endif /* __PERF_ABSPATH_H */
+#endif /* __API_UTIL_ABSPATH_H */

new file mode 100644
index 0000000..40653dc
@@ -0,0 +1,12 @@
+#include "compat-util.h"
+#include "cfg.h"
+
+#define UNDEFINED "UNDEFINED"
+
+struct util_cfg util_cfg = {
+	.prefix		= UNDEFINED,
+	.exec_name	= UNDEFINED,
+	.exec_path	= UNDEFINED,
+	.exec_path_env	= UNDEFINED,
+	.pager_env	= UNDEFINED,
+};

new file mode 100644
index 0000000..f271732
@@ -0,0 +1,15 @@
+#ifndef __API_UTIL_CONFIG_H
+#define __API_UTIL_CONFIG_H
+
+struct util_cfg {
+	const char *prefix;
+	const char *exec_name;
+	const char *exec_path;
+	const char *exec_path_env;
+	const char *pager_env;
+	void (*exit_browser)(void);
+};
+
+extern struct util_cfg util_cfg;
+
+#endif /* #define __API_UTIL_CONFIG_H */

similarity index 95%
rename from tools/perf/util/compat-util.h
rename to tools/lib/api/util/compat-util.h
index f472a98..ab2b257 100644
@@ -1,5 +1,5 @@
-#ifndef __PERF_COMPAT_UTIL_H
-#define __PERF_COMPAT_UTIL_H
+#ifndef __API_UTIL_COMPAT_UTIL_H
+#define __API_UTIL_COMPAT_UTIL_H
 
 #ifndef FLEX_ARRAY
 /*

@@ -74,7 +74,6 @@
 #include <linux/magic.h>
 #include <linux/types.h>
 #include <sys/ttydefaults.h>
-#include <api/fs/tracing_path.h>
 #include <termios.h>
 #include <linux/bitops.h>
 #include <termios.h>

@@ -127,4 +126,4 @@
 #define NSEC_PER_MSEC	1000000L
 #endif
 
-#endif /* __PERF_COMPAT_UTIL_H */
+#endif /* __API_UTIL_COMPAT_UTIL_H */

similarity index 97%
rename from tools/perf/util/ctype.c
rename to tools/lib/api/util/ctype.c
index aada3ac..a7b2d33 100644
@@ -3,7 +3,8 @@
  *
  * No surprises, and works with signed and unsigned chars.
  */
-#include "util.h"
+#include "compat-util.h"
+#include "ctype.h"
 
 enum {
 	S = GIT_SPACE,

similarity index 93%
rename from tools/perf/util/ctype.h
rename to tools/lib/api/util/ctype.h
index b66bfeb..1be5f8d 100644
@@ -1,5 +1,5 @@
-#ifndef __PERF_CTYPE_H
-#define __PERF_CTYPE_H
+#ifndef __API_UTIL_CTYPE_H
+#define __API_UTIL_CTYPE_H
 
 /* Sane ctype - no locale, and works with signed chars */
 #undef isascii

@@ -49,4 +49,4 @@ static inline int sane_case(int x, int high)
 	return x;
 }
 
-#endif /* __PERF_CTYPE_H */
+#endif /* __API_UTIL_CTYPE_H */

120 lines not on this page · raw message

similarity index 14%
rename from tools/perf/util/exec_cmd.h
rename to tools/lib/api/util/exec_cmd.h
index 48b4175..c826713 100644
@@ -1,13 +1,13 @@
-#ifndef __PERF_EXEC_CMD_H
-#define __PERF_EXEC_CMD_H
+#ifndef __API_UTIL_EXEC_CMD_H
+#define __API_UTIL_EXEC_CMD_H
 
-extern void perf_set_argv_exec_path(const char *exec_path);
-extern const char *perf_extract_argv0_path(const char *path);
+extern void set_argv_exec_path(const char *exec_path);
+extern const char *extract_argv0_path(const char *path);
 extern void setup_path(void);
-extern int execv_perf_cmd(const char **argv); /* NULL terminated */
-extern int execl_perf_cmd(const char *cmd, ...);
-/* perf_exec_path and system_path return malloc'd string, caller must free it */
-extern char *perf_exec_path(void);
+extern int execv_cmd(const char **argv); /* NULL terminated */
+extern int execl_cmd(const char *cmd, ...);
+/* get_argv_exec_path and system_path return malloc'd string, caller must free it */
+extern char *get_argv_exec_path(void);
 extern char *system_path(const char *path);
 
-#endif /* __PERF_EXEC_CMD_H */
+#endif /* __API_UTIL_EXEC_CMD_H */

similarity index 96%
rename from tools/perf/util/help.c
rename to tools/lib/api/util/help.c
index dfe9c5f..36b3e60 100644
@@ -1,6 +1,9 @@
-#include "util.h"
-#include "exec_cmd.h"
+#include "compat-util.h"
 #include "help.h"
+#include "exec_cmd.h"
+#include "strbuf.h"
+#include "wrapper.h"
+#include "term.h"
 
 void add_cmdname(struct cmdnames *cmds, const char *name, size_t len)
 {

@@ -164,7 +167,7 @@ void load_command_list(const char *prefix,
 		struct cmdnames *other_cmds)
 {
 	const char *env_path = getenv("PATH");
-	char *exec_path = perf_exec_path();
+	char *exec_path = get_argv_exec_path();
 
 	if (exec_path) {
 		list_commands_in_dir(main_cmds, exec_path, prefix);

@@ -209,7 +212,7 @@ void list_commands(const char *title, struct cmdnames *main_cmds,
 			longest = other_cmds->names[i]->len;
 
 	if (main_cmds->cnt) {
-		char *exec_path = perf_exec_path();
+		char *exec_path = get_argv_exec_path();
 		printf("available %s in '%s'\n", title, exec_path);
 		printf("----------------");
 		mput_char('-', strlen(title) + strlen(exec_path));

similarity index 100%
rename from tools/perf/util/help.h
rename to tools/lib/api/util/help.h

similarity index 93%
rename from tools/perf/util/pager.c
rename to tools/lib/api/util/pager.c
index 6cff2ac..97a59ed 100644
@@ -1,6 +1,8 @@
-#include "util.h"
+#include "compat-util.h"
+#include "pager.h"
 #include "run-command.h"
 #include "sigchain.h"
+#include "cfg.h"
 
 /*
  * This is split up from the rest of git so that we can do

@@ -46,7 +48,7 @@ static void wait_for_pager_signal(int signo)
 
 void setup_pager(void)
 {
-	const char *pager = getenv("PERF_PAGER");
+	const char *pager = getenv(util_cfg.pager_env);
 
 	if (!isatty(1))
 		return;

similarity index 42%
rename from tools/perf/util/pager.h
rename to tools/lib/api/util/pager.h
index 2794a83..3c13659 100644
@@ -1,7 +1,7 @@
-#ifndef __PERF_PAGER_H
-#define __PERF_PAGER_H
+#ifndef __API_UTIL_PAGER_H
+#define __API_UTIL_PAGER_H
 
 extern void setup_pager(void);
 extern int pager_in_use(void);
 
-#endif /* __PERF_PAGER_H */
+#endif /* __API_UTIL_PAGER_H */

similarity index 98%
rename from tools/perf/util/parse-options.c
rename to tools/lib/api/util/parse-options.c
index 8d70c1b..9e334a9 100644
@@ -1,7 +1,12 @@
-#include "util.h"
+#include "compat-util.h"
+
+#include "../string/string.h"
 #include "parse-options.h"
-#include "header.h"
-#include <api/string/string.h>
+#include "strbuf.h"
+#include "usage.h"
+#include "ctype.h"
+#include "pager.h"
+#include "cfg.h"
 
 #define OPT_SHORT 1
 #define OPT_UNSET 2

@@ -510,7 +515,8 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o
 	if (subcommands && !usagestr[0]) {
 		struct strbuf buf = STRBUF_INIT;
 
-		strbuf_addf(&buf, "perf %s [<options>] {", argv[0]);
+		strbuf_addf(&buf, "%s %s [<options>] {",
+			    util_cfg.exec_name, argv[0]);
 		for (int i = 0; subcommands[i]; i++) {
 			if (i)
 				strbuf_addstr(&buf, "|");

@@ -771,7 +777,9 @@ int usage_with_options_internal(const char * const *usagestr,
 void usage_with_options(const char * const *usagestr,
 			const struct option *opts)
 {
-	exit_browser(false);
+	if (util_cfg.exit_browser)
+		util_cfg.exit_browser();
+
 	usage_with_options_internal(usagestr, opts, 0, NULL);
 	exit(129);
 }

@@ -781,7 +789,8 @@ void usage_with_options_msg(const char * const *usagestr,
 {
 	va_list ap;
 
-	exit_browser(false);
+	if (util_cfg.exit_browser)
+		util_cfg.exit_browser();
 
 	va_start(ap, fmt);
 	strbuf_addv(&error_buf, fmt, ap);

similarity index 98%
rename from tools/perf/util/parse-options.h
rename to tools/lib/api/util/parse-options.h
index a8e407b..4b97cba 100644
@@ -1,8 +1,7 @@
-#ifndef __PERF_PARSE_OPTIONS_H
-#define __PERF_PARSE_OPTIONS_H
+#ifndef __API_UTIL_PARSE_OPTIONS_H
+#define __API_UTIL_PARSE_OPTIONS_H
 
-#include <linux/kernel.h>
-#include <stdbool.h>
+#include "compat-util.h"
 
 enum parse_opt_type {
 	/* special types */

@@ -226,4 +225,5 @@ extern int parse_opt_verbosity_cb(const struct option *, const char *, int);
 extern const char *parse_options_fix_filename(const char *prefix, const char *file);
 
 void set_option_flag(struct option *opts, int sopt, const char *lopt, int flag);
-#endif /* __PERF_PARSE_OPTIONS_H */
+
+#endif /* __API_UTIL_PARSE_OPTIONS_H */

similarity index 96%
rename from tools/perf/util/run-command.c
rename to tools/lib/api/util/run-command.c
index 38d2cc6..d5f2daa 100644
@@ -1,7 +1,9 @@
-#include "util.h"
+#include "compat-util.h"
 #include "run-command.h"
 #include "exec_cmd.h"
-#include "debug.h"
+#include "usage.h"
+
+#define STRERR_BUFSIZE 128
 
 static inline void close_pair(int fd[2])
 {

@@ -112,8 +114,8 @@ int start_command(struct child_process *cmd)
 		}
 		if (cmd->preexec_cb)
 			cmd->preexec_cb();
-		if (cmd->perf_cmd) {
-			execv_perf_cmd(cmd->argv);
+		if (cmd->exec_cmd) {
+			execv_cmd(cmd->argv);
 		} else {
 			execvp(cmd->argv[0], (char *const*) cmd->argv);
 		}

@@ -207,7 +209,7 @@ static void prepare_run_command_v_opt(struct child_process *cmd,
 	memset(cmd, 0, sizeof(*cmd));
 	cmd->argv = argv;
 	cmd->no_stdin = opt & RUN_COMMAND_NO_STDIN ? 1 : 0;
-	cmd->perf_cmd = opt & RUN_PERF_CMD ? 1 : 0;
+	cmd->exec_cmd = opt & RUN_EXEC_CMD ? 1 : 0;
 	cmd->stdout_to_stderr = opt & RUN_COMMAND_STDOUT_TO_STDERR ? 1 : 0;
 }
 

similarity index 87%
rename from tools/perf/util/run-command.h
rename to tools/lib/api/util/run-command.h
index 1ef264d..6876b14 100644
@@ -1,5 +1,5 @@
-#ifndef __PERF_RUN_COMMAND_H
-#define __PERF_RUN_COMMAND_H
+#ifndef __API_UTIL_RUN_COMMAND_H
+#define __API_UTIL_RUN_COMMAND_H
 
 enum {
 	ERR_RUN_COMMAND_FORK = 10000,

@@ -41,7 +41,7 @@ struct child_process {
 	unsigned no_stdin:1;
 	unsigned no_stdout:1;
 	unsigned no_stderr:1;
-	unsigned perf_cmd:1; /* if this is to be perf sub-command */
+	unsigned exec_cmd:1; /* if this is to be external sub-command */
 	unsigned stdout_to_stderr:1;
 	void (*preexec_cb)(void);
 };

@@ -51,8 +51,8 @@ int finish_command(struct child_process *);
 int run_command(struct child_process *);
 
 #define RUN_COMMAND_NO_STDIN 1
-#define RUN_PERF_CMD	     2	/*If this is to be perf sub-command */
+#define RUN_EXEC_CMD	     2	/*If this is to be external sub-command */
 #define RUN_COMMAND_STDOUT_TO_STDERR 4
 int run_command_v_opt(const char **argv, int opt);
 
-#endif /* __PERF_RUN_COMMAND_H */
+#endif /* __API_UTIL_RUN_COMMAND_H */

similarity index 93%
rename from tools/perf/util/sigchain.c
rename to tools/lib/api/util/sigchain.c
index 5eebf88..d7ed474 100644
@@ -1,5 +1,7 @@
-#include "util.h"
+#include "compat-util.h"
 #include "sigchain.h"
+#include "usage.h"
+#include "wrapper.h"
 
 #define SIGCHAIN_MAX_SIGNALS 32
 

similarity index 53%
rename from tools/perf/util/sigchain.h
rename to tools/lib/api/util/sigchain.h
index 959d64e..6038d7b 100644
@@ -1,5 +1,5 @@
-#ifndef __PERF_SIGCHAIN_H
-#define __PERF_SIGCHAIN_H
+#ifndef __API_UTIL_SIGCHAIN_H
+#define __API_UTIL_SIGCHAIN_H
 
 typedef void (*sigchain_fun)(int);
 

@@ -7,4 +7,4 @@ int sigchain_pop(int sig);
 
 void sigchain_push_common(sigchain_fun f);
 
-#endif /* __PERF_SIGCHAIN_H */
+#endif /* __API_UTIL_SIGCHAIN_H */

similarity index 97%
rename from tools/perf/util/strbuf.c
rename to tools/lib/api/util/strbuf.c
index 0e53793..6f0ae90 100644
@@ -1,5 +1,9 @@
-#include "util.h"
+#include "compat-util.h"
+
 #include <linux/kernel.h>
+#include "strbuf.h"
+#include "wrapper.h"
+#include "usage.h"
 
 int prefixcmp(const char *str, const char *prefix)
 {

similarity index 97%
rename from tools/perf/util/strbuf.h
rename to tools/lib/api/util/strbuf.h
index 39a1481..cc284a6 100644
@@ -1,5 +1,5 @@
-#ifndef __PERF_STRBUF_H
-#define __PERF_STRBUF_H
+#ifndef __API_UTIL_STRBUF_H
+#define __API_UTIL_STRBUF_H
 
 /*
  * Strbuf's can be use in many ways: as a byte array, or to store arbitrary

@@ -93,4 +93,4 @@ extern void strbuf_addv(struct strbuf *sb, const char *fmt, va_list ap);
 /* XXX: if read fails, any partial read is undone */
 extern ssize_t strbuf_read(struct strbuf *, int fd, ssize_t hint);
 
-#endif /* __PERF_STRBUF_H */
+#endif /* __API_UTIL_STRBUF_H */

similarity index 93%
rename from tools/perf/util/term.c
rename to tools/lib/api/util/term.c
index 90b47d8..e246994 100644
@@ -1,4 +1,5 @@
-#include "util.h"
+#include "compat-util.h"
+#include "term.h"
 
 void get_term_dimensions(struct winsize *ws)
 {