perf_counter tools: Move perfstat supporting code into perfcounters.h

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/Documentation/perf_counter/perfcounters.h b/Documentation/perf_counter/perfcounters.h
index 8c1559b25f10b40ac3555f84f0a6fd5998655de4..0f3764aa52abdef2878b10da207ebd5a948337fe 100644 (file)
--- a/Documentation/perf_counter/perfcounters.h
+++ b/Documentation/perf_counter/perfcounters.h
@@ -16,6 +16,14 @@
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
+#define rdclock()                                      \
+({                                                     \
+       struct timespec ts;                             \
+                                                       \
+       clock_gettime(CLOCK_MONOTONIC, &ts);            \
+       ts.tv_sec * 1000000000ULL + ts.tv_nsec;         \
+})
+
 /*
  * Pick up some kernel type conventions:
  */
@@ -135,3 +143,125 @@ asmlinkage int sys_perf_counter_open(
        return ret;
 }
 
+static char *hw_event_names [] = {
+       "CPU cycles",
+       "instructions",
+       "cache references",
+       "cache misses",
+       "branches",
+       "branch misses",
+       "bus cycles",
+};
+
+static char *sw_event_names [] = {
+       "cpu clock ticks",
+       "task clock ticks",
+       "pagefaults",
+       "context switches",
+       "CPU migrations",
+};
+
+struct event_symbol {
+       int event;
+       char *symbol;
+};
+
+static struct event_symbol event_symbols [] = {
+       {PERF_COUNT_CPU_CYCLES,                 "cpu-cycles",           },
+       {PERF_COUNT_CPU_CYCLES,                 "cycles",               },
+       {PERF_COUNT_INSTRUCTIONS,               "instructions",         },
+       {PERF_COUNT_CACHE_REFERENCES,           "cache-references",     },
+       {PERF_COUNT_CACHE_MISSES,               "cache-misses",         },
+       {PERF_COUNT_BRANCH_INSTRUCTIONS,        "branch-instructions",  },
+       {PERF_COUNT_BRANCH_INSTRUCTIONS,        "branches",             },
+       {PERF_COUNT_BRANCH_MISSES,              "branch-misses",        },
+       {PERF_COUNT_BUS_CYCLES,                 "bus-cycles",           },
+       {PERF_COUNT_CPU_CLOCK,                  "cpu-ticks",            },
+       {PERF_COUNT_CPU_CLOCK,                  "ticks",                },
+       {PERF_COUNT_TASK_CLOCK,                 "task-ticks",           },
+       {PERF_COUNT_PAGE_FAULTS,                "page-faults",          },
+       {PERF_COUNT_PAGE_FAULTS,                "faults",               },
+       {PERF_COUNT_CONTEXT_SWITCHES,           "context-switches",     },
+       {PERF_COUNT_CONTEXT_SWITCHES,           "cs",                   },
+       {PERF_COUNT_CPU_MIGRATIONS,             "cpu-migrations",       },
+       {PERF_COUNT_CPU_MIGRATIONS,             "migrations",           },
+};
+
+static int type_valid(int type)
+{
+       if (type >= PERF_HW_EVENTS_MAX)
+               return 0;
+       if (type <= PERF_SW_EVENTS_MIN)
+               return 0;
+
+       return 1;
+}
+
+static char *event_name(int ctr)
+{
+       int type = event_id[ctr];
+       static char buf[32];
+
+       if (event_raw[ctr]) {
+               sprintf(buf, "raw 0x%x", type);
+               return buf;
+       }
+       if (!type_valid(type))
+               return "unknown";
+
+       if (type >= 0)
+               return hw_event_names[type];
+
+       return sw_event_names[-type-1];
+}
+
+/*
+ * Each event can have multiple symbolic names.
+ * Symbolic names are (almost) exactly matched.
+ */
+static int match_event_symbols(char *str)
+{
+       unsigned int i;
+
+       if (isdigit(str[0]) || str[0] == '-')
+               return atoi(str);
+
+       for (i = 0; i < ARRAY_SIZE(event_symbols); i++) {
+               if (!strncmp(str, event_symbols[i].symbol,
+                            strlen(event_symbols[i].symbol)))
+                       return event_symbols[i].event;
+       }
+
+       return PERF_HW_EVENTS_MAX;
+}
+
+static void parse_events(char *str)
+{
+       int type, raw;
+
+again:
+       nr_counters++;
+       if (nr_counters == MAX_COUNTERS)
+               display_help();
+
+       raw = 0;
+       if (*str == 'r') {
+               raw = 1;
+               ++str;
+               type = strtol(str, NULL, 16);
+       } else {
+               type = match_event_symbols(str);
+               if (!type_valid(type))
+                       display_help();
+       }
+
+       event_id[nr_counters] = type;
+       event_raw[nr_counters] = raw;
+
+       str = strstr(str, ",");
+       if (str) {
+               str++;
+               goto again;
+       }
+}
+

diff --git a/Documentation/perf_counter/perfstat.c b/Documentation/perf_counter/perfstat.c
index a3d4a7a602f66f0bad5f53fa3b001aeaae51e5ec..3364dcb9dd9d302f5787792d35f948a67919daff 100644 (file)
--- a/Documentation/perf_counter/perfstat.c
+++ b/Documentation/perf_counter/perfstat.c
@@ -54,50 +54,6 @@
 
 #include "perfcounters.h"
 
-static char *hw_event_names [] = {
-       "CPU cycles",
-       "instructions",
-       "cache references",
-       "cache misses",
-       "branches",
-       "branch misses",
-       "bus cycles",
-};
-
-static char *sw_event_names [] = {
-       "cpu clock ticks",
-       "task clock ticks",
-       "pagefaults",
-       "context switches",
-       "CPU migrations",
-};
-
-struct event_symbol {
-       int event;
-       char *symbol;
-};
-
-static struct event_symbol event_symbols [] = {
-       {PERF_COUNT_CPU_CYCLES,                 "cpu-cycles",           },
-       {PERF_COUNT_CPU_CYCLES,                 "cycles",               },
-       {PERF_COUNT_INSTRUCTIONS,               "instructions",         },
-       {PERF_COUNT_CACHE_REFERENCES,           "cache-references",     },
-       {PERF_COUNT_CACHE_MISSES,               "cache-misses",         },
-       {PERF_COUNT_BRANCH_INSTRUCTIONS,        "branch-instructions",  },
-       {PERF_COUNT_BRANCH_INSTRUCTIONS,        "branches",             },
-       {PERF_COUNT_BRANCH_MISSES,              "branch-misses",        },
-       {PERF_COUNT_BUS_CYCLES,                 "bus-cycles",           },
-       {PERF_COUNT_CPU_CLOCK,                  "cpu-ticks",            },
-       {PERF_COUNT_CPU_CLOCK,                  "ticks",                },
-       {PERF_COUNT_TASK_CLOCK,                 "task-ticks",           },
-       {PERF_COUNT_PAGE_FAULTS,                "page-faults",          },
-       {PERF_COUNT_PAGE_FAULTS,                "faults",               },
-       {PERF_COUNT_CONTEXT_SWITCHES,           "context-switches",     },
-       {PERF_COUNT_CONTEXT_SWITCHES,           "cs",                   },
-       {PERF_COUNT_CPU_MIGRATIONS,             "cpu-migrations",       },
-       {PERF_COUNT_CPU_MIGRATIONS,             "migrations",           },
-};
-
 static int                     nr_counters             = 0;
 static int                     nr_cpus                 = 0;
 
@@ -137,84 +93,6 @@ static void display_help(void)
        exit(0);
 }
 
-static int type_valid(int type)
-{
-       if (type >= PERF_HW_EVENTS_MAX)
-               return 0;
-       if (type <= PERF_SW_EVENTS_MIN)
-               return 0;
-
-       return 1;
-}
-
-static char *event_name(int ctr)
-{
-       int type = event_id[ctr];
-       static char buf[32];
-
-       if (event_raw[ctr]) {
-               sprintf(buf, "raw 0x%x", type);
-               return buf;
-       }
-       if (!type_valid(type))
-               return "unknown";
-
-       if (type >= 0)
-               return hw_event_names[type];
-
-       return sw_event_names[-type-1];
-}
-
-/*
- * Each event can have multiple symbolic names.
- * Symbolic names are (almost) exactly matched.
- */
-static int match_event_symbols(char *str)
-{
-       unsigned int i;
-
-       if (isdigit(str[0]) || str[0] == '-')
-               return atoi(str);
-
-       for (i = 0; i < ARRAY_SIZE(event_symbols); i++) {
-               if (!strncmp(str, event_symbols[i].symbol,
-                            strlen(event_symbols[i].symbol)))
-                       return event_symbols[i].event;
-       }
-
-       return PERF_HW_EVENTS_MAX;
-}
-
-static void parse_events(char *str)
-{
-       int type, raw;
-
-again:
-       nr_counters++;
-       if (nr_counters == MAX_COUNTERS)
-               display_help();
-
-       raw = 0;
-       if (*str == 'r') {
-               raw = 1;
-               ++str;
-               type = strtol(str, NULL, 16);
-       } else {
-               type = match_event_symbols(str);
-               if (!type_valid(type))
-                       display_help();
-       }
-
-       event_id[nr_counters] = type;
-       event_raw[nr_counters] = raw;
-
-       str = strstr(str, ",");
-       if (str) {
-               str++;
-               goto again;
-       }
-}
-
 static void process_options(int argc, char *argv[])
 {
        for (;;) {
@@ -296,14 +174,6 @@ static void create_counter(int counter)
 }
 
 
-#define rdclock()                                      \
-({                                                     \
-       struct timespec ts;                             \
-                                                       \
-       clock_gettime(CLOCK_MONOTONIC, &ts);            \
-       ts.tv_sec * 1000000000ULL + ts.tv_nsec;         \
-})
-
 int main(int argc, char *argv[])
 {
        unsigned long long t0, t1;