perf_counter tools: move helper library to util/*
Clean up the top level directory a bit by moving all the helper libraries
to util/*.[ch].
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/Documentation/perf_counter/Makefile b/Documentation/perf_counter/Makefile
index 690045e..543ccf2 100644
--- a/Documentation/perf_counter/Makefile
+++ b/Documentation/perf_counter/Makefile
@@ -147,7 +147,7 @@
# broken, or spawning external process is slower than built-in grep perf has).
PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE
- @$(SHELL_PATH) ./PERF-VERSION-GEN
+ @$(SHELL_PATH) util/PERF-VERSION-GEN
-include PERF-VERSION-FILE
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
@@ -287,26 +287,28 @@
LIB_FILE=libperf.a
LIB_H += ../../include/linux/perf_counter.h
-LIB_H += levenshtein.h
-LIB_H += parse-options.h
-LIB_H += quote.h
-LIB_H += strbuf.h
-LIB_H += run-command.h
+LIB_H += util/levenshtein.h
+LIB_H += util/parse-options.h
+LIB_H += util/quote.h
+LIB_H += util/util.h
+LIB_H += util/help.h
+LIB_H += util/strbuf.h
+LIB_H += util/run-command.h
-LIB_OBJS += abspath.o
-LIB_OBJS += alias.o
-LIB_OBJS += config.o
-LIB_OBJS += ctype.o
-LIB_OBJS += exec_cmd.o
-LIB_OBJS += help.o
-LIB_OBJS += levenshtein.o
-LIB_OBJS += parse-options.o
-LIB_OBJS += path.o
-LIB_OBJS += run-command.o
-LIB_OBJS += quote.o
-LIB_OBJS += strbuf.o
-LIB_OBJS += usage.o
-LIB_OBJS += wrapper.o
+LIB_OBJS += util/abspath.o
+LIB_OBJS += util/alias.o
+LIB_OBJS += util/config.o
+LIB_OBJS += util/ctype.o
+LIB_OBJS += util/exec_cmd.o
+LIB_OBJS += util/help.o
+LIB_OBJS += util/levenshtein.o
+LIB_OBJS += util/parse-options.o
+LIB_OBJS += util/path.o
+LIB_OBJS += util/run-command.o
+LIB_OBJS += util/quote.o
+LIB_OBJS += util/strbuf.o
+LIB_OBJS += util/usage.o
+LIB_OBJS += util/wrapper.o
BUILTIN_OBJS += builtin-help.o
BUILTIN_OBJS += builtin-record.o
@@ -620,10 +622,10 @@
ln -s perf$X $@ 2>/dev/null || \
cp perf$X $@
-common-cmds.h: ./generate-cmdlist.sh command-list.txt
+common-cmds.h: util/generate-cmdlist.sh command-list.txt
common-cmds.h: $(wildcard Documentation/perf-*.txt)
- $(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@
+ $(QUIET_GEN)util/generate-cmdlist.sh > $@+ && mv $@+ $@
$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
$(QUIET_GEN)$(RM) $@ $@+ && \
@@ -656,7 +658,7 @@
%.o: %.S
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
-exec_cmd.o: exec_cmd.c PERF-CFLAGS
+util/exec_cmd.o: util/exec_cmd.c PERF-CFLAGS
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) \
'-DPERF_EXEC_PATH="$(perfexecdir_SQ)"' \
'-DBINDIR="$(bindir_relative_SQ)"' \
@@ -666,7 +668,7 @@
builtin-init-db.o: builtin-init-db.c PERF-CFLAGS
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DDEFAULT_PERF_TEMPLATE_DIR='"$(template_dir_SQ)"' $<
-config.o: config.c PERF-CFLAGS
+util/config.o: util/config.c PERF-CFLAGS
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<
perf-%$X: %.o $(PERFLIBS)
@@ -729,7 +731,7 @@
check: common-cmds.h
if sparse; \
then \
- for i in *.c; \
+ for i in *.c */*.c; \
do \
sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; \
done; \
@@ -795,7 +797,7 @@
$(RM) configure
clean:
- $(RM) *.o $(LIB_FILE)
+ $(RM) *.o */*.o $(LIB_FILE)
$(RM) $(ALL_PROGRAMS) $(BUILT_INS) perf$X
$(RM) $(TEST_PROGRAMS)
$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope*
@@ -836,7 +838,7 @@
-j1 test
coverage-report:
- gcov -b *.c
- grep '^function.*called 0 ' *.c.gcov \
+ gcov -b *.c */*.c
+ grep '^function.*called 0 ' *.c.gcov */*.c.gcov \
| sed -e 's/\([^:]*\)\.gcov: *function \([^ ]*\) called.*/\1: \2/' \
| tee coverage-untested-functions
diff --git a/Documentation/perf_counter/builtin-help.c b/Documentation/perf_counter/builtin-help.c
index a136d61..6616de0 100644
--- a/Documentation/perf_counter/builtin-help.c
+++ b/Documentation/perf_counter/builtin-help.c
@@ -3,13 +3,13 @@
*
* Builtin help command
*/
-#include "cache.h"
+#include "util/cache.h"
#include "builtin.h"
-#include "exec_cmd.h"
+#include "util/exec_cmd.h"
#include "common-cmds.h"
-#include "parse-options.h"
-#include "run-command.h"
-#include "help.h"
+#include "util/parse-options.h"
+#include "util/run-command.h"
+#include "util/help.h"
static struct man_viewer_list {
struct man_viewer_list *next;
diff --git a/Documentation/perf_counter/builtin-stat.c b/Documentation/perf_counter/builtin-stat.c
index 169a2d1..d7ace631 100644
--- a/Documentation/perf_counter/builtin-stat.c
+++ b/Documentation/perf_counter/builtin-stat.c
@@ -61,7 +61,7 @@
* Released under the GPL v2. (and only v2, not any later version)
*/
-#include "util.h"
+#include "util/util.h"
#include <getopt.h>
#include <assert.h>
diff --git a/Documentation/perf_counter/builtin-top.c b/Documentation/perf_counter/builtin-top.c
index 98e8690..dea016f 100644
--- a/Documentation/perf_counter/builtin-top.c
+++ b/Documentation/perf_counter/builtin-top.c
@@ -42,7 +42,7 @@
* Released under the GPL v2. (and only v2, not any later version)
*/
-#include "util.h"
+#include "util/util.h"
#include <getopt.h>
#include <assert.h>
diff --git a/Documentation/perf_counter/builtin.h b/Documentation/perf_counter/builtin.h
index 800f86c..d32318a 100644
--- a/Documentation/perf_counter/builtin.h
+++ b/Documentation/perf_counter/builtin.h
@@ -1,8 +1,8 @@
#ifndef BUILTIN_H
#define BUILTIN_H
-#include "util.h"
-#include "strbuf.h"
+#include "util/util.h"
+#include "util/strbuf.h"
extern const char perf_version_string[];
extern const char perf_usage_string[];
diff --git a/Documentation/perf_counter/perf.c b/Documentation/perf_counter/perf.c
index 8d6faec..594d270 100644
--- a/Documentation/perf_counter/perf.c
+++ b/Documentation/perf_counter/perf.c
@@ -1,8 +1,8 @@
#include "builtin.h"
-#include "exec_cmd.h"
-#include "cache.h"
-#include "quote.h"
-#include "run-command.h"
+#include "util/exec_cmd.h"
+#include "util/cache.h"
+#include "util/quote.h"
+#include "util/run-command.h"
const char perf_usage_string[] =
"perf [--version] [--help] COMMAND [ARGS]";
diff --git a/Documentation/perf_counter/PERF-VERSION-GEN b/Documentation/perf_counter/util/PERF-VERSION-GEN
similarity index 100%
rename from Documentation/perf_counter/PERF-VERSION-GEN
rename to Documentation/perf_counter/util/PERF-VERSION-GEN
diff --git a/Documentation/perf_counter/abspath.c b/Documentation/perf_counter/util/abspath.c
similarity index 100%
rename from Documentation/perf_counter/abspath.c
rename to Documentation/perf_counter/util/abspath.c
diff --git a/Documentation/perf_counter/alias.c b/Documentation/perf_counter/util/alias.c
similarity index 100%
rename from Documentation/perf_counter/alias.c
rename to Documentation/perf_counter/util/alias.c
diff --git a/Documentation/perf_counter/cache.h b/Documentation/perf_counter/util/cache.h
similarity index 100%
rename from Documentation/perf_counter/cache.h
rename to Documentation/perf_counter/util/cache.h
diff --git a/Documentation/perf_counter/config.c b/Documentation/perf_counter/util/config.c
similarity index 100%
rename from Documentation/perf_counter/config.c
rename to Documentation/perf_counter/util/config.c
diff --git a/Documentation/perf_counter/ctype.c b/Documentation/perf_counter/util/ctype.c
similarity index 100%
rename from Documentation/perf_counter/ctype.c
rename to Documentation/perf_counter/util/ctype.c
diff --git a/Documentation/perf_counter/exec_cmd.c b/Documentation/perf_counter/util/exec_cmd.c
similarity index 100%
rename from Documentation/perf_counter/exec_cmd.c
rename to Documentation/perf_counter/util/exec_cmd.c
diff --git a/Documentation/perf_counter/exec_cmd.h b/Documentation/perf_counter/util/exec_cmd.h
similarity index 100%
rename from Documentation/perf_counter/exec_cmd.h
rename to Documentation/perf_counter/util/exec_cmd.h
diff --git a/Documentation/perf_counter/generate-cmdlist.sh b/Documentation/perf_counter/util/generate-cmdlist.sh
similarity index 100%
rename from Documentation/perf_counter/generate-cmdlist.sh
rename to Documentation/perf_counter/util/generate-cmdlist.sh
diff --git a/Documentation/perf_counter/help.c b/Documentation/perf_counter/util/help.c
similarity index 99%
rename from Documentation/perf_counter/help.c
rename to Documentation/perf_counter/util/help.c
index ec01167..edde541 100644
--- a/Documentation/perf_counter/help.c
+++ b/Documentation/perf_counter/util/help.c
@@ -1,5 +1,5 @@
#include "cache.h"
-#include "builtin.h"
+#include "../builtin.h"
#include "exec_cmd.h"
#include "levenshtein.h"
#include "help.h"
diff --git a/Documentation/perf_counter/help.h b/Documentation/perf_counter/util/help.h
similarity index 100%
rename from Documentation/perf_counter/help.h
rename to Documentation/perf_counter/util/help.h
diff --git a/Documentation/perf_counter/levenshtein.c b/Documentation/perf_counter/util/levenshtein.c
similarity index 100%
rename from Documentation/perf_counter/levenshtein.c
rename to Documentation/perf_counter/util/levenshtein.c
diff --git a/Documentation/perf_counter/levenshtein.h b/Documentation/perf_counter/util/levenshtein.h
similarity index 100%
rename from Documentation/perf_counter/levenshtein.h
rename to Documentation/perf_counter/util/levenshtein.h
diff --git a/Documentation/perf_counter/parse-options.c b/Documentation/perf_counter/util/parse-options.c
similarity index 99%
rename from Documentation/perf_counter/parse-options.c
rename to Documentation/perf_counter/util/parse-options.c
index 7464f34..28b34c1 100644
--- a/Documentation/perf_counter/parse-options.c
+++ b/Documentation/perf_counter/util/parse-options.c
@@ -469,9 +469,6 @@
}
-/*----- some often used options -----*/
-#include "cache.h"
-
int parse_opt_verbosity_cb(const struct option *opt, const char *arg,
int unset)
{
diff --git a/Documentation/perf_counter/parse-options.h b/Documentation/perf_counter/util/parse-options.h
similarity index 100%
rename from Documentation/perf_counter/parse-options.h
rename to Documentation/perf_counter/util/parse-options.h
diff --git a/Documentation/perf_counter/path.c b/Documentation/perf_counter/util/path.c
similarity index 100%
rename from Documentation/perf_counter/path.c
rename to Documentation/perf_counter/util/path.c
diff --git a/Documentation/perf_counter/quote.c b/Documentation/perf_counter/util/quote.c
similarity index 100%
rename from Documentation/perf_counter/quote.c
rename to Documentation/perf_counter/util/quote.c
diff --git a/Documentation/perf_counter/quote.h b/Documentation/perf_counter/util/quote.h
similarity index 97%
rename from Documentation/perf_counter/quote.h
rename to Documentation/perf_counter/util/quote.h
index 66730f2..5dfad89 100644
--- a/Documentation/perf_counter/quote.h
+++ b/Documentation/perf_counter/util/quote.h
@@ -18,7 +18,7 @@
* run the command on the other side:
*
* sprintf(cmd, "git-diff-tree %s %s", sq_quote(arg0), sq_quote(arg1));
- * sprintf(rcmd, "ssh %s %s", sq_quote(host), sq_quote(cmd));
+ * sprintf(rcmd, "ssh %s %s", sq_util/quote.host), sq_quote(cmd));
*
* Note that the above examples leak memory! Remember to free result from
* sq_quote() in a real application.
diff --git a/Documentation/perf_counter/run-command.c b/Documentation/perf_counter/util/run-command.c
similarity index 100%
rename from Documentation/perf_counter/run-command.c
rename to Documentation/perf_counter/util/run-command.c
diff --git a/Documentation/perf_counter/run-command.h b/Documentation/perf_counter/util/run-command.h
similarity index 100%
rename from Documentation/perf_counter/run-command.h
rename to Documentation/perf_counter/util/run-command.h
diff --git a/Documentation/perf_counter/strbuf.c b/Documentation/perf_counter/util/strbuf.c
similarity index 100%
rename from Documentation/perf_counter/strbuf.c
rename to Documentation/perf_counter/util/strbuf.c
diff --git a/Documentation/perf_counter/strbuf.h b/Documentation/perf_counter/util/strbuf.h
similarity index 100%
rename from Documentation/perf_counter/strbuf.h
rename to Documentation/perf_counter/util/strbuf.h
diff --git a/Documentation/perf_counter/usage.c b/Documentation/perf_counter/util/usage.c
similarity index 100%
rename from Documentation/perf_counter/usage.c
rename to Documentation/perf_counter/util/usage.c
diff --git a/Documentation/perf_counter/util.h b/Documentation/perf_counter/util/util.h
similarity index 100%
rename from Documentation/perf_counter/util.h
rename to Documentation/perf_counter/util/util.h
diff --git a/Documentation/perf_counter/wrapper.c b/Documentation/perf_counter/util/wrapper.c
similarity index 100%
rename from Documentation/perf_counter/wrapper.c
rename to Documentation/perf_counter/util/wrapper.c