perf tools: Fix sample size bit operations

What we want is to count the number of bits in the mask,
not some other random operation written in the middle
of the night.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1306148788-6179-2-git-send-email-fweisbec@gmail.com
[ Fixed perf_event__names[] alignment which was nearby and hurting my eyes ... ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 17c1c3c875c3714612a38cb3ef4c2201c33b70b5..252b72a5e59ef17fc477dc7cc87eb7b8dbac7699 100644 (file)
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -9,21 +9,21 @@
 #include "thread_map.h"
 
 static const char *perf_event__names[] = {
-       [0]                      = "TOTAL",
-       [PERF_RECORD_MMAP]       = "MMAP",
-       [PERF_RECORD_LOST]       = "LOST",
-       [PERF_RECORD_COMM]       = "COMM",
-       [PERF_RECORD_EXIT]       = "EXIT",
-       [PERF_RECORD_THROTTLE]   = "THROTTLE",
-       [PERF_RECORD_UNTHROTTLE] = "UNTHROTTLE",
-       [PERF_RECORD_FORK]       = "FORK",
-       [PERF_RECORD_READ]       = "READ",
-       [PERF_RECORD_SAMPLE]     = "SAMPLE",
-       [PERF_RECORD_HEADER_ATTR]        = "ATTR",
-       [PERF_RECORD_HEADER_EVENT_TYPE]  = "EVENT_TYPE",
-       [PERF_RECORD_HEADER_TRACING_DATA]        = "TRACING_DATA",
-       [PERF_RECORD_HEADER_BUILD_ID]    = "BUILD_ID",
-       [PERF_RECORD_FINISHED_ROUND]     = "FINISHED_ROUND",
+       [0]                                     = "TOTAL",
+       [PERF_RECORD_MMAP]                      = "MMAP",
+       [PERF_RECORD_LOST]                      = "LOST",
+       [PERF_RECORD_COMM]                      = "COMM",
+       [PERF_RECORD_EXIT]                      = "EXIT",
+       [PERF_RECORD_THROTTLE]                  = "THROTTLE",
+       [PERF_RECORD_UNTHROTTLE]                = "UNTHROTTLE",
+       [PERF_RECORD_FORK]                      = "FORK",
+       [PERF_RECORD_READ]                      = "READ",
+       [PERF_RECORD_SAMPLE]                    = "SAMPLE",
+       [PERF_RECORD_HEADER_ATTR]               = "ATTR",
+       [PERF_RECORD_HEADER_EVENT_TYPE]         = "EVENT_TYPE",
+       [PERF_RECORD_HEADER_TRACING_DATA]       = "TRACING_DATA",
+       [PERF_RECORD_HEADER_BUILD_ID]           = "BUILD_ID",
+       [PERF_RECORD_FINISHED_ROUND]            = "FINISHED_ROUND",
 };
 
 const char *perf_event__name(unsigned int id)
@@ -42,7 +42,7 @@ int perf_sample_size(u64 sample_type)
        int i;
 
        for (i = 0; i < 64; i++) {
-               if ((mask << i) & 1)
+               if (mask & (1UL << i))
                        size++;
        }