Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
tools
/
perf
/
perf.c
diff --git
a/kernel/tools/perf/perf.c
b/kernel/tools/perf/perf.c
index
b857fcb
..
3d4c7c0
100644
(file)
--- a/
kernel/tools/perf/perf.c
+++ b/
kernel/tools/perf/perf.c
@@
-8,14
+8,16
@@
*/
#include "builtin.h"
*/
#include "builtin.h"
+#include "util/env.h"
#include "util/exec_cmd.h"
#include "util/cache.h"
#include "util/quote.h"
#include "util/run-command.h"
#include "util/parse-events.h"
#include "util/parse-options.h"
#include "util/exec_cmd.h"
#include "util/cache.h"
#include "util/quote.h"
#include "util/run-command.h"
#include "util/parse-events.h"
#include "util/parse-options.h"
+#include "util/bpf-loader.h"
#include "util/debug.h"
#include "util/debug.h"
-#include <api/fs/
debugfs
.h>
+#include <api/fs/
tracing_path
.h>
#include <pthread.h>
const char perf_usage_string[] =
#include <pthread.h>
const char perf_usage_string[] =
@@
-160,6
+162,20
@@
static int handle_options(const char ***argv, int *argc, int *envchanged)
if (!strcmp(cmd, "--help") || !strcmp(cmd, "--version"))
break;
if (!strcmp(cmd, "--help") || !strcmp(cmd, "--version"))
break;
+ /*
+ * Shortcut for '-h' and '-v' options to invoke help
+ * and version command.
+ */
+ if (!strcmp(cmd, "-h")) {
+ (*argv)[0] = "--help";
+ break;
+ }
+
+ if (!strcmp(cmd, "-v")) {
+ (*argv)[0] = "--version";
+ break;
+ }
+
/*
* Check remaining flags.
*/
/*
* Check remaining flags.
*/
@@
-214,7
+230,7
@@
static int handle_options(const char ***argv, int *argc, int *envchanged)
fprintf(stderr, "No directory given for --debugfs-dir.\n");
usage(perf_usage_string);
}
fprintf(stderr, "No directory given for --debugfs-dir.\n");
usage(perf_usage_string);
}
-
perf_debugfs_set_path
((*argv)[1]);
+
tracing_path_set
((*argv)[1]);
if (envchanged)
*envchanged = 1;
(*argv)++;
if (envchanged)
*envchanged = 1;
(*argv)++;
@@
-230,8
+246,8
@@
static int handle_options(const char ***argv, int *argc, int *envchanged)
(*argv)++;
(*argc)--;
} else if (!prefixcmp(cmd, CMD_DEBUGFS_DIR)) {
(*argv)++;
(*argc)--;
} else if (!prefixcmp(cmd, CMD_DEBUGFS_DIR)) {
-
perf_debugfs_set_path
(cmd + strlen(CMD_DEBUGFS_DIR));
- fprintf(stderr, "dir: %s\n",
debugfs_mountpoint
);
+
tracing_path_set
(cmd + strlen(CMD_DEBUGFS_DIR));
+ fprintf(stderr, "dir: %s\n",
tracing_path
);
if (envchanged)
*envchanged = 1;
} else if (!strcmp(cmd, "--list-cmds")) {
if (envchanged)
*envchanged = 1;
} else if (!strcmp(cmd, "--list-cmds")) {
@@
-369,6
+385,8
@@
static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
status = p->fn(argc, argv, prefix);
exit_browser(status);
status = p->fn(argc, argv, prefix);
exit_browser(status);
+ perf_env__exit(&perf_env);
+ bpf__clear();
if (status)
return status & 0xff;
if (status)
return status & 0xff;
@@
-517,8
+535,10
@@
int main(int argc, const char **argv)
cmd = perf_extract_argv0_path(argv[0]);
if (!cmd)
cmd = "perf-help";
cmd = perf_extract_argv0_path(argv[0]);
if (!cmd)
cmd = "perf-help";
- /* get debugfs mount point from /proc/mounts */
- perf_debugfs_mount(NULL);
+
+ /* get debugfs/tracefs mount point from /proc/mounts */
+ tracing_path_mount();
+
/*
* "perf-xxxx" is the same as "perf xxxx", but we obviously:
*
/*
* "perf-xxxx" is the same as "perf xxxx", but we obviously:
*