aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-27 02:02:14 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-27 03:05:08 -0400
commit148be2c15d4a866fbc7a8f55342e4fd4de73be61 (patch)
treea99f8c85552166f187a233ce29eb442f27fe620d
parentf1f9b3b1795da8625e0e6096813c9d18d4a344ce (diff)
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>
-rw-r--r--Documentation/perf_counter/Makefile60
-rw-r--r--Documentation/perf_counter/builtin-help.c10
-rw-r--r--Documentation/perf_counter/builtin-stat.c2
-rw-r--r--Documentation/perf_counter/builtin-top.c2
-rw-r--r--Documentation/perf_counter/builtin.h4
-rw-r--r--Documentation/perf_counter/perf.c8
-rwxr-xr-xDocumentation/perf_counter/util/PERF-VERSION-GEN (renamed from Documentation/perf_counter/PERF-VERSION-GEN)0
-rw-r--r--Documentation/perf_counter/util/abspath.c (renamed from Documentation/perf_counter/abspath.c)0
-rw-r--r--Documentation/perf_counter/util/alias.c (renamed from Documentation/perf_counter/alias.c)0
-rw-r--r--Documentation/perf_counter/util/cache.h (renamed from Documentation/perf_counter/cache.h)0
-rw-r--r--Documentation/perf_counter/util/config.c (renamed from Documentation/perf_counter/config.c)0
-rw-r--r--Documentation/perf_counter/util/ctype.c (renamed from Documentation/perf_counter/ctype.c)0
-rw-r--r--Documentation/perf_counter/util/exec_cmd.c (renamed from Documentation/perf_counter/exec_cmd.c)0
-rw-r--r--Documentation/perf_counter/util/exec_cmd.h (renamed from Documentation/perf_counter/exec_cmd.h)0
-rwxr-xr-xDocumentation/perf_counter/util/generate-cmdlist.sh (renamed from Documentation/perf_counter/generate-cmdlist.sh)0
-rw-r--r--Documentation/perf_counter/util/help.c (renamed from Documentation/perf_counter/help.c)2
-rw-r--r--Documentation/perf_counter/util/help.h (renamed from Documentation/perf_counter/help.h)0
-rw-r--r--Documentation/perf_counter/util/levenshtein.c (renamed from Documentation/perf_counter/levenshtein.c)0
-rw-r--r--Documentation/perf_counter/util/levenshtein.h (renamed from Documentation/perf_counter/levenshtein.h)0
-rw-r--r--Documentation/perf_counter/util/parse-options.c (renamed from Documentation/perf_counter/parse-options.c)3
-rw-r--r--Documentation/perf_counter/util/parse-options.h (renamed from Documentation/perf_counter/parse-options.h)0
-rw-r--r--Documentation/perf_counter/util/path.c (renamed from Documentation/perf_counter/path.c)0
-rw-r--r--Documentation/perf_counter/util/quote.c (renamed from Documentation/perf_counter/quote.c)0
-rw-r--r--Documentation/perf_counter/util/quote.h (renamed from Documentation/perf_counter/quote.h)2
-rw-r--r--Documentation/perf_counter/util/run-command.c (renamed from Documentation/perf_counter/run-command.c)0
-rw-r--r--Documentation/perf_counter/util/run-command.h (renamed from Documentation/perf_counter/run-command.h)0
-rw-r--r--Documentation/perf_counter/util/strbuf.c (renamed from Documentation/perf_counter/strbuf.c)0
-rw-r--r--Documentation/perf_counter/util/strbuf.h (renamed from Documentation/perf_counter/strbuf.h)0
-rw-r--r--Documentation/perf_counter/util/usage.c (renamed from Documentation/perf_counter/usage.c)0
-rw-r--r--Documentation/perf_counter/util/util.h (renamed from Documentation/perf_counter/util.h)0
-rw-r--r--Documentation/perf_counter/util/wrapper.c (renamed from Documentation/perf_counter/wrapper.c)0
31 files changed, 46 insertions, 47 deletions
diff --git a/Documentation/perf_counter/Makefile b/Documentation/perf_counter/Makefile
index 690045e49692..543ccf28ac4a 100644
--- a/Documentation/perf_counter/Makefile
+++ b/Documentation/perf_counter/Makefile
@@ -147,7 +147,7 @@ all::
147# broken, or spawning external process is slower than built-in grep perf has). 147# broken, or spawning external process is slower than built-in grep perf has).
148 148
149PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE 149PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE
150 @$(SHELL_PATH) ./PERF-VERSION-GEN 150 @$(SHELL_PATH) util/PERF-VERSION-GEN
151-include PERF-VERSION-FILE 151-include PERF-VERSION-FILE
152 152
153uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') 153uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
@@ -287,26 +287,28 @@ export PERL_PATH
287LIB_FILE=libperf.a 287LIB_FILE=libperf.a
288 288
289LIB_H += ../../include/linux/perf_counter.h 289LIB_H += ../../include/linux/perf_counter.h
290LIB_H += levenshtein.h 290LIB_H += util/levenshtein.h
291LIB_H += parse-options.h 291LIB_H += util/parse-options.h
292LIB_H += quote.h 292LIB_H += util/quote.h
293LIB_H += strbuf.h 293LIB_H += util/util.h
294LIB_H += run-command.h 294LIB_H += util/help.h
295 295LIB_H += util/strbuf.h
296LIB_OBJS += abspath.o 296LIB_H += util/run-command.h
297LIB_OBJS += alias.o 297
298LIB_OBJS += config.o 298LIB_OBJS += util/abspath.o
299LIB_OBJS += ctype.o 299LIB_OBJS += util/alias.o
300LIB_OBJS += exec_cmd.o 300LIB_OBJS += util/config.o
301LIB_OBJS += help.o 301LIB_OBJS += util/ctype.o
302LIB_OBJS += levenshtein.o 302LIB_OBJS += util/exec_cmd.o
303LIB_OBJS += parse-options.o 303LIB_OBJS += util/help.o
304LIB_OBJS += path.o 304LIB_OBJS += util/levenshtein.o
305LIB_OBJS += run-command.o 305LIB_OBJS += util/parse-options.o
306LIB_OBJS += quote.o 306LIB_OBJS += util/path.o
307LIB_OBJS += strbuf.o 307LIB_OBJS += util/run-command.o
308LIB_OBJS += usage.o 308LIB_OBJS += util/quote.o
309LIB_OBJS += wrapper.o 309LIB_OBJS += util/strbuf.o
310LIB_OBJS += util/usage.o
311LIB_OBJS += util/wrapper.o
310 312
311BUILTIN_OBJS += builtin-help.o 313BUILTIN_OBJS += builtin-help.o
312BUILTIN_OBJS += builtin-record.o 314BUILTIN_OBJS += builtin-record.o
@@ -620,10 +622,10 @@ $(BUILT_INS): perf$X
620 ln -s perf$X $@ 2>/dev/null || \ 622 ln -s perf$X $@ 2>/dev/null || \
621 cp perf$X $@ 623 cp perf$X $@
622 624
623common-cmds.h: ./generate-cmdlist.sh command-list.txt 625common-cmds.h: util/generate-cmdlist.sh command-list.txt
624 626
625common-cmds.h: $(wildcard Documentation/perf-*.txt) 627common-cmds.h: $(wildcard Documentation/perf-*.txt)
626 $(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@ 628 $(QUIET_GEN)util/generate-cmdlist.sh > $@+ && mv $@+ $@
627 629
628$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh 630$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
629 $(QUIET_GEN)$(RM) $@ $@+ && \ 631 $(QUIET_GEN)$(RM) $@ $@+ && \
@@ -656,7 +658,7 @@ perf.o perf.spec \
656%.o: %.S 658%.o: %.S
657 $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $< 659 $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
658 660
659exec_cmd.o: exec_cmd.c PERF-CFLAGS 661util/exec_cmd.o: util/exec_cmd.c PERF-CFLAGS
660 $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) \ 662 $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) \
661 '-DPERF_EXEC_PATH="$(perfexecdir_SQ)"' \ 663 '-DPERF_EXEC_PATH="$(perfexecdir_SQ)"' \
662 '-DBINDIR="$(bindir_relative_SQ)"' \ 664 '-DBINDIR="$(bindir_relative_SQ)"' \
@@ -666,7 +668,7 @@ exec_cmd.o: exec_cmd.c PERF-CFLAGS
666builtin-init-db.o: builtin-init-db.c PERF-CFLAGS 668builtin-init-db.o: builtin-init-db.c PERF-CFLAGS
667 $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DDEFAULT_PERF_TEMPLATE_DIR='"$(template_dir_SQ)"' $< 669 $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DDEFAULT_PERF_TEMPLATE_DIR='"$(template_dir_SQ)"' $<
668 670
669config.o: config.c PERF-CFLAGS 671util/config.o: util/config.c PERF-CFLAGS
670 $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $< 672 $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<
671 673
672perf-%$X: %.o $(PERFLIBS) 674perf-%$X: %.o $(PERFLIBS)
@@ -729,7 +731,7 @@ export NO_SVN_TESTS
729check: common-cmds.h 731check: common-cmds.h
730 if sparse; \ 732 if sparse; \
731 then \ 733 then \
732 for i in *.c; \ 734 for i in *.c */*.c; \
733 do \ 735 do \
734 sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; \ 736 sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; \
735 done; \ 737 done; \
@@ -795,7 +797,7 @@ distclean: clean
795 $(RM) configure 797 $(RM) configure
796 798
797clean: 799clean:
798 $(RM) *.o $(LIB_FILE) 800 $(RM) *.o */*.o $(LIB_FILE)
799 $(RM) $(ALL_PROGRAMS) $(BUILT_INS) perf$X 801 $(RM) $(ALL_PROGRAMS) $(BUILT_INS) perf$X
800 $(RM) $(TEST_PROGRAMS) 802 $(RM) $(TEST_PROGRAMS)
801 $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope* 803 $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope*
@@ -836,7 +838,7 @@ coverage-build: coverage-clean
836 -j1 test 838 -j1 test
837 839
838coverage-report: 840coverage-report:
839 gcov -b *.c 841 gcov -b *.c */*.c
840 grep '^function.*called 0 ' *.c.gcov \ 842 grep '^function.*called 0 ' *.c.gcov */*.c.gcov \
841 | sed -e 's/\([^:]*\)\.gcov: *function \([^ ]*\) called.*/\1: \2/' \ 843 | sed -e 's/\([^:]*\)\.gcov: *function \([^ ]*\) called.*/\1: \2/' \
842 | tee coverage-untested-functions 844 | tee coverage-untested-functions
diff --git a/Documentation/perf_counter/builtin-help.c b/Documentation/perf_counter/builtin-help.c
index a136d619db37..6616de0ef053 100644
--- a/Documentation/perf_counter/builtin-help.c
+++ b/Documentation/perf_counter/builtin-help.c
@@ -3,13 +3,13 @@
3 * 3 *
4 * Builtin help command 4 * Builtin help command
5 */ 5 */
6#include "cache.h" 6#include "util/cache.h"
7#include "builtin.h" 7#include "builtin.h"
8#include "exec_cmd.h" 8#include "util/exec_cmd.h"
9#include "common-cmds.h" 9#include "common-cmds.h"
10#include "parse-options.h" 10#include "util/parse-options.h"
11#include "run-command.h" 11#include "util/run-command.h"
12#include "help.h" 12#include "util/help.h"
13 13
14static struct man_viewer_list { 14static struct man_viewer_list {
15 struct man_viewer_list *next; 15 struct man_viewer_list *next;
diff --git a/Documentation/perf_counter/builtin-stat.c b/Documentation/perf_counter/builtin-stat.c
index 169a2d1783fc..d7ace631fc4f 100644
--- a/Documentation/perf_counter/builtin-stat.c
+++ b/Documentation/perf_counter/builtin-stat.c
@@ -61,7 +61,7 @@
61 * Released under the GPL v2. (and only v2, not any later version) 61 * Released under the GPL v2. (and only v2, not any later version)
62 */ 62 */
63 63
64#include "util.h" 64#include "util/util.h"
65 65
66#include <getopt.h> 66#include <getopt.h>
67#include <assert.h> 67#include <assert.h>
diff --git a/Documentation/perf_counter/builtin-top.c b/Documentation/perf_counter/builtin-top.c
index 98e8690b6bcb..dea016fa41e8 100644
--- a/Documentation/perf_counter/builtin-top.c
+++ b/Documentation/perf_counter/builtin-top.c
@@ -42,7 +42,7 @@
42 * Released under the GPL v2. (and only v2, not any later version) 42 * Released under the GPL v2. (and only v2, not any later version)
43 */ 43 */
44 44
45#include "util.h" 45#include "util/util.h"
46 46
47#include <getopt.h> 47#include <getopt.h>
48#include <assert.h> 48#include <assert.h>
diff --git a/Documentation/perf_counter/builtin.h b/Documentation/perf_counter/builtin.h
index 800f86c1d445..d32318aed8cf 100644
--- a/Documentation/perf_counter/builtin.h
+++ b/Documentation/perf_counter/builtin.h
@@ -1,8 +1,8 @@
1#ifndef BUILTIN_H 1#ifndef BUILTIN_H
2#define BUILTIN_H 2#define BUILTIN_H
3 3
4#include "util.h" 4#include "util/util.h"
5#include "strbuf.h" 5#include "util/strbuf.h"
6 6
7extern const char perf_version_string[]; 7extern const char perf_version_string[];
8extern const char perf_usage_string[]; 8extern const char perf_usage_string[];
diff --git a/Documentation/perf_counter/perf.c b/Documentation/perf_counter/perf.c
index 8d6faecdc15d..594d270be390 100644
--- a/Documentation/perf_counter/perf.c
+++ b/Documentation/perf_counter/perf.c
@@ -1,8 +1,8 @@
1#include "builtin.h" 1#include "builtin.h"
2#include "exec_cmd.h" 2#include "util/exec_cmd.h"
3#include "cache.h" 3#include "util/cache.h"
4#include "quote.h" 4#include "util/quote.h"
5#include "run-command.h" 5#include "util/run-command.h"
6 6
7const char perf_usage_string[] = 7const char perf_usage_string[] =
8 "perf [--version] [--help] COMMAND [ARGS]"; 8 "perf [--version] [--help] COMMAND [ARGS]";
diff --git a/Documentation/perf_counter/PERF-VERSION-GEN b/Documentation/perf_counter/util/PERF-VERSION-GEN
index c561d1538c03..c561d1538c03 100755
--- a/Documentation/perf_counter/PERF-VERSION-GEN
+++ b/Documentation/perf_counter/util/PERF-VERSION-GEN
diff --git a/Documentation/perf_counter/abspath.c b/Documentation/perf_counter/util/abspath.c
index 649f34f83365..649f34f83365 100644
--- a/Documentation/perf_counter/abspath.c
+++ b/Documentation/perf_counter/util/abspath.c
diff --git a/Documentation/perf_counter/alias.c b/Documentation/perf_counter/util/alias.c
index 9b3dd2b428df..9b3dd2b428df 100644
--- a/Documentation/perf_counter/alias.c
+++ b/Documentation/perf_counter/util/alias.c
diff --git a/Documentation/perf_counter/cache.h b/Documentation/perf_counter/util/cache.h
index 71080512fa86..71080512fa86 100644
--- a/Documentation/perf_counter/cache.h
+++ b/Documentation/perf_counter/util/cache.h
diff --git a/Documentation/perf_counter/config.c b/Documentation/perf_counter/util/config.c
index 3dd13faa6a27..3dd13faa6a27 100644
--- a/Documentation/perf_counter/config.c
+++ b/Documentation/perf_counter/util/config.c
diff --git a/Documentation/perf_counter/ctype.c b/Documentation/perf_counter/util/ctype.c
index b90ec004f29c..b90ec004f29c 100644
--- a/Documentation/perf_counter/ctype.c
+++ b/Documentation/perf_counter/util/ctype.c
diff --git a/Documentation/perf_counter/exec_cmd.c b/Documentation/perf_counter/util/exec_cmd.c
index d39292263153..d39292263153 100644
--- a/Documentation/perf_counter/exec_cmd.c
+++ b/Documentation/perf_counter/util/exec_cmd.c
diff --git a/Documentation/perf_counter/exec_cmd.h b/Documentation/perf_counter/util/exec_cmd.h
index effe25eb1545..effe25eb1545 100644
--- a/Documentation/perf_counter/exec_cmd.h
+++ b/Documentation/perf_counter/util/exec_cmd.h
diff --git a/Documentation/perf_counter/generate-cmdlist.sh b/Documentation/perf_counter/util/generate-cmdlist.sh
index f06f6fd148f8..f06f6fd148f8 100755
--- a/Documentation/perf_counter/generate-cmdlist.sh
+++ b/Documentation/perf_counter/util/generate-cmdlist.sh
diff --git a/Documentation/perf_counter/help.c b/Documentation/perf_counter/util/help.c
index ec0116721660..edde541d238d 100644
--- a/Documentation/perf_counter/help.c
+++ b/Documentation/perf_counter/util/help.c
@@ -1,5 +1,5 @@
1#include "cache.h" 1#include "cache.h"
2#include "builtin.h" 2#include "../builtin.h"
3#include "exec_cmd.h" 3#include "exec_cmd.h"
4#include "levenshtein.h" 4#include "levenshtein.h"
5#include "help.h" 5#include "help.h"
diff --git a/Documentation/perf_counter/help.h b/Documentation/perf_counter/util/help.h
index 56bc15406ffc..56bc15406ffc 100644
--- a/Documentation/perf_counter/help.h
+++ b/Documentation/perf_counter/util/help.h
diff --git a/Documentation/perf_counter/levenshtein.c b/Documentation/perf_counter/util/levenshtein.c
index e521d1516df6..e521d1516df6 100644
--- a/Documentation/perf_counter/levenshtein.c
+++ b/Documentation/perf_counter/util/levenshtein.c
diff --git a/Documentation/perf_counter/levenshtein.h b/Documentation/perf_counter/util/levenshtein.h
index 0173abeef52c..0173abeef52c 100644
--- a/Documentation/perf_counter/levenshtein.h
+++ b/Documentation/perf_counter/util/levenshtein.h
diff --git a/Documentation/perf_counter/parse-options.c b/Documentation/perf_counter/util/parse-options.c
index 7464f34e5407..28b34c1c29cf 100644
--- a/Documentation/perf_counter/parse-options.c
+++ b/Documentation/perf_counter/util/parse-options.c
@@ -469,9 +469,6 @@ int parse_options_usage(const char * const *usagestr,
469} 469}
470 470
471 471
472/*----- some often used options -----*/
473#include "cache.h"
474
475int parse_opt_verbosity_cb(const struct option *opt, const char *arg, 472int parse_opt_verbosity_cb(const struct option *opt, const char *arg,
476 int unset) 473 int unset)
477{ 474{
diff --git a/Documentation/perf_counter/parse-options.h b/Documentation/perf_counter/util/parse-options.h
index a81c7faff68e..a81c7faff68e 100644
--- a/Documentation/perf_counter/parse-options.h
+++ b/Documentation/perf_counter/util/parse-options.h
diff --git a/Documentation/perf_counter/path.c b/Documentation/perf_counter/util/path.c
index a501a40dd2cb..a501a40dd2cb 100644
--- a/Documentation/perf_counter/path.c
+++ b/Documentation/perf_counter/util/path.c
diff --git a/Documentation/perf_counter/quote.c b/Documentation/perf_counter/util/quote.c
index 7a49fcf69671..7a49fcf69671 100644
--- a/Documentation/perf_counter/quote.c
+++ b/Documentation/perf_counter/util/quote.c
diff --git a/Documentation/perf_counter/quote.h b/Documentation/perf_counter/util/quote.h
index 66730f2bff3c..5dfad89816db 100644
--- a/Documentation/perf_counter/quote.h
+++ b/Documentation/perf_counter/util/quote.h
@@ -18,7 +18,7 @@
18 * run the command on the other side: 18 * run the command on the other side:
19 * 19 *
20 * sprintf(cmd, "git-diff-tree %s %s", sq_quote(arg0), sq_quote(arg1)); 20 * sprintf(cmd, "git-diff-tree %s %s", sq_quote(arg0), sq_quote(arg1));
21 * sprintf(rcmd, "ssh %s %s", sq_quote(host), sq_quote(cmd)); 21 * sprintf(rcmd, "ssh %s %s", sq_util/quote.host), sq_quote(cmd));
22 * 22 *
23 * Note that the above examples leak memory! Remember to free result from 23 * Note that the above examples leak memory! Remember to free result from
24 * sq_quote() in a real application. 24 * sq_quote() in a real application.
diff --git a/Documentation/perf_counter/run-command.c b/Documentation/perf_counter/util/run-command.c
index b2f5e854f40a..b2f5e854f40a 100644
--- a/Documentation/perf_counter/run-command.c
+++ b/Documentation/perf_counter/util/run-command.c
diff --git a/Documentation/perf_counter/run-command.h b/Documentation/perf_counter/util/run-command.h
index 328289f23669..328289f23669 100644
--- a/Documentation/perf_counter/run-command.h
+++ b/Documentation/perf_counter/util/run-command.h
diff --git a/Documentation/perf_counter/strbuf.c b/Documentation/perf_counter/util/strbuf.c
index eaba09306802..eaba09306802 100644
--- a/Documentation/perf_counter/strbuf.c
+++ b/Documentation/perf_counter/util/strbuf.c
diff --git a/Documentation/perf_counter/strbuf.h b/Documentation/perf_counter/util/strbuf.h
index 9ee908a3ec5d..9ee908a3ec5d 100644
--- a/Documentation/perf_counter/strbuf.h
+++ b/Documentation/perf_counter/util/strbuf.h
diff --git a/Documentation/perf_counter/usage.c b/Documentation/perf_counter/util/usage.c
index 7a10421fe6b4..7a10421fe6b4 100644
--- a/Documentation/perf_counter/usage.c
+++ b/Documentation/perf_counter/util/usage.c
diff --git a/Documentation/perf_counter/util.h b/Documentation/perf_counter/util/util.h
index 36e40c38e093..36e40c38e093 100644
--- a/Documentation/perf_counter/util.h
+++ b/Documentation/perf_counter/util/util.h
diff --git a/Documentation/perf_counter/wrapper.c b/Documentation/perf_counter/util/wrapper.c
index 6350d65f6d9e..6350d65f6d9e 100644
--- a/Documentation/perf_counter/wrapper.c
+++ b/Documentation/perf_counter/util/wrapper.c