Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf updates from Ingo Molnar:
 "This tree includes some late late perf items that missed the first
  round:

  tools:

   - Bash auto completion improvements, now we can auto complete the
     tools long options, tracepoint event names, etc, from Namhyung Kim.

   - Look up thread using tid instead of pid in 'perf sched'.

   - Move global variables into a perf_kvm struct, from David Ahern.

   - Hists refactorings, preparatory for improved 'diff' command, from
     Jiri Olsa.

   - Hists refactorings, preparatory for event group viewieng work, from
     Namhyung Kim.

   - Remove double negation on optional feature macro definitions, from
     Namhyung Kim.

   - Remove several cases of needless global variables, on most
     builtins.

   - misc fixes

  kernel:

   - sysfs support for IBS on AMD CPUs, from Robert Richter.

   - Support for an upcoming Intel CPU, the Xeon-Phi / Knights Corner
     HPC blade PMU, from Vince Weaver.

   - misc fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (46 commits)
  perf: Fix perf_cgroup_switch for sw-events
  perf: Clarify perf_cpu_context::active_pmu usage by renaming it to ::unique_pmu
  perf/AMD/IBS: Add sysfs support
  perf hists: Add more helpers for hist entry stat
  perf hists: Move he->stat.nr_events initialization to a template
  perf hists: Introduce struct he_stat
  perf diff: Removing the total_period argument from output code
  perf tool: Add hpp interface to enable/disable hpp column
  perf tools: Removing hists pair argument from output path
  perf hists: Separate overhead and baseline columns
  perf diff: Refactor diff displacement possition info
  perf hists: Add struct hists pointer to struct hist_entry
  perf tools: Complete tracepoint event names
  perf/x86: Add support for Intel Xeon-Phi Knights Corner PMU
  perf evlist: Remove some unused methods
  perf evlist: Introduce add_newtp method
  perf kvm: Move global variables into a perf_kvm struct
  perf tools: Convert to BACKTRACE_SUPPORT
  perf tools: Long option completion support for each subcommands
  perf tools: Complete long option names of perf command
  ...

1 files changed, 45 insertions, 43 deletions

diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 1eaa6617c814..4688bea95c12 100644
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -14,8 +14,10 @@
 
 #include "util/parse-options.h"
 
-static char             const *input_name = "-";
-static bool             inject_build_ids;
+struct perf_inject {
+        struct perf_tool tool;
+        bool             build_ids;
+};
 
 static int perf_event__repipe_synth(struct perf_tool *tool __maybe_unused,
                                     union perf_event *event,
@@ -194,7 +196,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool,
                                  * account this as unresolved.
                                  */
                         } else {
-#ifndef NO_LIBELF_SUPPORT
+#ifdef LIBELF_SUPPORT
                                 pr_warning("no symbols found in %s, maybe "
                                            "install a debug package?\n",
                                            al.map->dso->long_name);
@@ -208,22 +210,6 @@ repipe:
         return 0;
 }
 
-struct perf_tool perf_inject = {
-        .sample         = perf_event__repipe_sample,
-        .mmap           = perf_event__repipe,
-        .comm           = perf_event__repipe,
-        .fork           = perf_event__repipe,
-        .exit           = perf_event__repipe,
-        .lost           = perf_event__repipe,
-        .read           = perf_event__repipe_sample,
-        .throttle       = perf_event__repipe,
-        .unthrottle     = perf_event__repipe,
-        .attr           = perf_event__repipe_attr,
-        .event_type     = perf_event__repipe_event_type_synth,
-        .tracing_data   = perf_event__repipe_tracing_data_synth,
-        .build_id       = perf_event__repipe_op2_synth,
-};
-
 extern volatile int session_done;
 
 static void sig_handler(int sig __maybe_unused)
@@ -231,56 +217,72 @@ static void sig_handler(int sig __maybe_unused)
         session_done = 1;
 }
 
-static int __cmd_inject(void)
+static int __cmd_inject(struct perf_inject *inject)
 {
         struct perf_session *session;
         int ret = -EINVAL;
 
         signal(SIGINT, sig_handler);
 
-        if (inject_build_ids) {
-                perf_inject.sample       = perf_event__inject_buildid;
-                perf_inject.mmap         = perf_event__repipe_mmap;
-                perf_inject.fork         = perf_event__repipe_task;
-                perf_inject.tracing_data = perf_event__repipe_tracing_data;
+        if (inject->build_ids) {
+                inject->tool.sample       = perf_event__inject_buildid;
+                inject->tool.mmap         = perf_event__repipe_mmap;
+                inject->tool.fork         = perf_event__repipe_task;
+                inject->tool.tracing_data = perf_event__repipe_tracing_data;
         }
 
-        session = perf_session__new(input_name, O_RDONLY, false, true, &perf_inject);
+        session = perf_session__new("-", O_RDONLY, false, true, &inject->tool);
         if (session == NULL)
                 return -ENOMEM;
 
-        ret = perf_session__process_events(session, &perf_inject);
+        ret = perf_session__process_events(session, &inject->tool);
 
         perf_session__delete(session);
 
         return ret;
 }
 
-static const char * const report_usage[] = {
-        "perf inject [<options>]",
-        NULL
-};
-
-static const struct option options[] = {
-        OPT_BOOLEAN('b', "build-ids", &inject_build_ids,
-                    "Inject build-ids into the output stream"),
-        OPT_INCR('v', "verbose", &verbose,
-                 "be more verbose (show build ids, etc)"),
-        OPT_END()
-};
-
 int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
 {
-        argc = parse_options(argc, argv, options, report_usage, 0);
+        struct perf_inject inject = {
+                .tool = {
+                        .sample         = perf_event__repipe_sample,
+                        .mmap           = perf_event__repipe,
+                        .comm           = perf_event__repipe,
+                        .fork           = perf_event__repipe,
+                        .exit           = perf_event__repipe,
+                        .lost           = perf_event__repipe,
+                        .read           = perf_event__repipe_sample,
+                        .throttle       = perf_event__repipe,
+                        .unthrottle     = perf_event__repipe,
+                        .attr           = perf_event__repipe_attr,
+                        .event_type     = perf_event__repipe_event_type_synth,
+                        .tracing_data   = perf_event__repipe_tracing_data_synth,
+                        .build_id       = perf_event__repipe_op2_synth,
+                },
+        };
+        const struct option options[] = {
+                OPT_BOOLEAN('b', "build-ids", &inject.build_ids,
+                            "Inject build-ids into the output stream"),
+                OPT_INCR('v', "verbose", &verbose,
+                         "be more verbose (show build ids, etc)"),
+                OPT_END()
+        };
+        const char * const inject_usage[] = {
+                "perf inject [<options>]",
+                NULL
+        };
+
+        argc = parse_options(argc, argv, options, inject_usage, 0);
 
         /*
          * Any (unrecognized) arguments left?
          */
         if (argc)
-                usage_with_options(report_usage, options);
+                usage_with_options(inject_usage, options);
 
         if (symbol__init() < 0)
                 return -1;
 
-        return __cmd_inject();
+        return __cmd_inject(&inject);
 }