aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@redhat.com>2014-07-17 06:55:00 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2014-07-17 11:58:59 -0400
commitbbb2cea7e8dd496b41558df1a0ec9205497b7ebf (patch)
tree7a73131f1871315194c0a3a594c82b0946c3ca3d
parentc95688aac7723c17b2badc23233706b2f02e58ed (diff)
perf tools: Add --debug optionto set debug variable
Adding --debug option as a way to setup debug variables. Starting with support for verbose, more will come. It's possible to use it now with report command: $ perf --debug verbose ... $ perf --debug verbose=2 ... I'll need this support to add separated debug variable for ordered events change in order to separate debug output out of standard verbose stream. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/20140717105500.GG516@krava.redhat.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/Documentation/perf.txt10
-rw-r--r--tools/perf/perf.c13
-rw-r--r--tools/perf/util/debug.c44
-rw-r--r--tools/perf/util/debug.h2
4 files changed, 67 insertions, 2 deletions
diff --git a/tools/perf/Documentation/perf.txt b/tools/perf/Documentation/perf.txt
index 0eeb247dc7d2..d240bb2e5b22 100644
--- a/tools/perf/Documentation/perf.txt
+++ b/tools/perf/Documentation/perf.txt
@@ -8,7 +8,15 @@ perf - Performance analysis tools for Linux
8SYNOPSIS 8SYNOPSIS
9-------- 9--------
10[verse] 10[verse]
11'perf' [--version] [--help] COMMAND [ARGS] 11'perf' [--version] [--help] [OPTIONS] COMMAND [ARGS]
12
13OPTIONS
14-------
15--debug::
16 Setup debug variable (just verbose for now) in value
17 range (0, 10). Use like:
18 --debug verbose # sets verbose = 1
19 --debug verbose=2 # sets verbose = 2
12 20
13DESCRIPTION 21DESCRIPTION
14----------- 22-----------
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 95c58fc15284..eed3fb2a3af0 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -13,11 +13,12 @@
13#include "util/quote.h" 13#include "util/quote.h"
14#include "util/run-command.h" 14#include "util/run-command.h"
15#include "util/parse-events.h" 15#include "util/parse-events.h"
16#include "util/debug.h"
16#include <api/fs/debugfs.h> 17#include <api/fs/debugfs.h>
17#include <pthread.h> 18#include <pthread.h>
18 19
19const char perf_usage_string[] = 20const char perf_usage_string[] =
20 "perf [--version] [--help] COMMAND [ARGS]"; 21 "perf [--version] [--debug variable[=VALUE]] [--help] COMMAND [ARGS]";
21 22
22const char perf_more_info_string[] = 23const char perf_more_info_string[] =
23 "See 'perf help COMMAND' for more information on a specific command."; 24 "See 'perf help COMMAND' for more information on a specific command.";
@@ -212,6 +213,16 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
212 printf("%s ", p->cmd); 213 printf("%s ", p->cmd);
213 } 214 }
214 exit(0); 215 exit(0);
216 } else if (!strcmp(cmd, "--debug")) {
217 if (*argc < 2) {
218 fprintf(stderr, "No variable specified for --debug.\n");
219 usage(perf_usage_string);
220 }
221 if (perf_debug_option((*argv)[1]))
222 usage(perf_usage_string);
223
224 (*argv)++;
225 (*argc)--;
215 } else { 226 } else {
216 fprintf(stderr, "Unknown option: %s\n", cmd); 227 fprintf(stderr, "Unknown option: %s\n", cmd);
217 usage(perf_usage_string); 228 usage(perf_usage_string);
diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
index c208d6f56e63..71d419362634 100644
--- a/tools/perf/util/debug.c
+++ b/tools/perf/util/debug.c
@@ -105,3 +105,47 @@ void trace_event(union perf_event *event)
105 } 105 }
106 printf(".\n"); 106 printf(".\n");
107} 107}
108
109static struct debug_variable {
110 const char *name;
111 int *ptr;
112} debug_variables[] = {
113 { .name = "verbose", .ptr = &verbose },
114 { .name = NULL, }
115};
116
117int perf_debug_option(const char *str)
118{
119 struct debug_variable *var = &debug_variables[0];
120 char *vstr, *s = strdup(str);
121 int v = 1;
122
123 vstr = strchr(s, '=');
124 if (vstr)
125 *vstr++ = 0;
126
127 while (var->name) {
128 if (!strcmp(s, var->name))
129 break;
130 var++;
131 }
132
133 if (!var->name) {
134 pr_err("Unknown debug variable name '%s'\n", s);
135 free(s);
136 return -1;
137 }
138
139 if (vstr) {
140 v = atoi(vstr);
141 /*
142 * Allow only values in range (0, 10),
143 * otherwise set 0.
144 */
145 v = (v < 0) || (v > 10) ? 0 : v;
146 }
147
148 *var->ptr = v;
149 free(s);
150 return 0;
151}
diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h
index 1cb808123242..89fb6b0f7ab2 100644
--- a/tools/perf/util/debug.h
+++ b/tools/perf/util/debug.h
@@ -39,4 +39,6 @@ void pr_stat(const char *fmt, ...);
39 39
40int eprintf(int level, int var, const char *fmt, ...) __attribute__((format(printf, 3, 4))); 40int eprintf(int level, int var, const char *fmt, ...) __attribute__((format(printf, 3, 4)));
41 41
42int perf_debug_option(const char *str);
43
42#endif /* __PERF_DEBUG_H */ 44#endif /* __PERF_DEBUG_H */