summaryrefslogtreecommitdiffstats
path: root/tools/perf/util
diff options
context:
space:
mode:
authorJaswinder Singh Rajput <jaswinder@kernel.org>2009-06-22 17:17:26 +0200
committerIngo Molnar <mingo@elte.hu>2009-06-22 17:25:53 +0200
commitc0c22dbfa8ba3c5045eeb9c76d2822ffc44fefc3 (patch)
tree036d5f39f6c6d39b0e28144a319d4d7c2da2ee80 /tools/perf/util
parentperf report: Output more symbol related debug data (diff)
downloadlinux-c0c22dbfa8ba3c5045eeb9c76d2822ffc44fefc3.tar.xz
linux-c0c22dbfa8ba3c5045eeb9c76d2822ffc44fefc3.zip
perf_counter tools: Set alias for page-faults
"faults" should be alias for "page-faults" Also fixed alignment and 80 characters issue Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> LKML-Reference: <1245683846.12092.1.camel@localhost.localdomain> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util')
-rw-r--r--tools/perf/util/parse-events.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index f5695486ad3f..06af2fadcd87 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -33,8 +33,7 @@ static struct event_symbol event_symbols[] = {
{ CSW(CPU_CLOCK), "cpu-clock", "" },
{ CSW(TASK_CLOCK), "task-clock", "" },
- { CSW(PAGE_FAULTS), "page-faults", "" },
- { CSW(PAGE_FAULTS), "faults", "" },
+ { CSW(PAGE_FAULTS), "page-faults", "faults" },
{ CSW(PAGE_FAULTS_MIN), "minor-faults", "" },
{ CSW(PAGE_FAULTS_MAJ), "major-faults", "" },
{ CSW(CONTEXT_SWITCHES), "context-switches", "cs" },
@@ -71,24 +70,24 @@ static char *sw_event_names[] = {
#define MAX_ALIASES 8
-static char *hw_cache [][MAX_ALIASES] = {
- { "L1-data" , "l1-d", "l1d" },
- { "L1-instruction" , "l1-i", "l1i" },
- { "L2" , "l2" },
- { "Data-TLB" , "dtlb", "d-tlb" },
- { "Instruction-TLB" , "itlb", "i-tlb" },
- { "Branch" , "bpu" , "btb", "bpc" },
+static char *hw_cache[][MAX_ALIASES] = {
+ { "L1-data", "l1-d", "l1d" },
+ { "L1-instruction", "l1-i", "l1i" },
+ { "L2", "l2" },
+ { "Data-TLB", "dtlb", "d-tlb" },
+ { "Instruction-TLB", "itlb", "i-tlb" },
+ { "Branch", "bpu" , "btb", "bpc" },
};
-static char *hw_cache_op [][MAX_ALIASES] = {
- { "Load" , "read" },
- { "Store" , "write" },
- { "Prefetch" , "speculative-read", "speculative-load" },
+static char *hw_cache_op[][MAX_ALIASES] = {
+ { "Load", "read" },
+ { "Store", "write" },
+ { "Prefetch", "speculative-read", "speculative-load" },
};
-static char *hw_cache_result [][MAX_ALIASES] = {
- { "Reference" , "ops", "access" },
- { "Miss" },
+static char *hw_cache_result[][MAX_ALIASES] = {
+ { "Reference", "ops", "access" },
+ { "Miss" },
};
char *event_name(int counter)
@@ -160,7 +159,8 @@ static int parse_aliases(const char *str, char *names[][MAX_ALIASES], int size)
return -1;
}
-static int parse_generic_hw_symbols(const char *str, struct perf_counter_attr *attr)
+static int
+parse_generic_hw_symbols(const char *str, struct perf_counter_attr *attr)
{
int cache_type = -1, cache_op = 0, cache_result = 0;
@@ -201,7 +201,7 @@ static int check_events(const char *str, unsigned int i)
if (strlen(event_symbols[i].alias))
if (!strncmp(str, event_symbols[i].alias,
- strlen(event_symbols[i].alias)))
+ strlen(event_symbols[i].alias)))
return 1;
return 0;
}