perf kmem: Fix statistics typo

[pandora-kernel.git] / tools / perf / builtin-kmem.c

diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 6f74bd8..7ceb741 100644 (file)
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -20,8 +20,6 @@ typedef int (*sort_fn_t)(struct alloc_stat *, struct alloc_stat *);
 
 static char const              *input_name = "perf.data";
 
-static u64                     sample_type;
-
 static int                     alloc_flag;
 static int                     caller_flag;
 
@@ -139,7 +137,7 @@ static void insert_alloc_stat(unsigned long call_site, unsigned long ptr,
        if (data && data->ptr == ptr) {
                data->hit++;
                data->bytes_req += bytes_req;
-               data->bytes_alloc += bytes_req;
+               data->bytes_alloc += bytes_alloc;
        } else {
                data = malloc(sizeof(*data));
                if (!data)
@@ -179,7 +177,7 @@ static void insert_caller_stat(unsigned long call_site,
        if (data && data->call_site == call_site) {
                data->hit++;
                data->bytes_req += bytes_req;
-               data->bytes_alloc += bytes_req;
+               data->bytes_alloc += bytes_alloc;
        } else {
                data = malloc(sizeof(*data));
                if (!data)
@@ -311,7 +309,7 @@ process_raw_event(event_t *raw_event __used, void *data,
        }
 }
 
-static int process_sample_event(event_t *event, struct perf_session *session __used)
+static int process_sample_event(event_t *event, struct perf_session *session)
 {
        struct sample_data data;
        struct thread *thread;
@@ -321,7 +319,7 @@ static int process_sample_event(event_t *event, struct perf_session *session __u
        data.cpu = -1;
        data.period = 1;
 
-       event__parse_sample(event, sample_type, &data);
+       event__parse_sample(event, session->sample_type, &data);
 
        dump_printf("(IP, %d): %d/%d: %p period: %Ld\n",
                event->header.misc,
@@ -329,7 +327,7 @@ static int process_sample_event(event_t *event, struct perf_session *session __u
                (void *)(long)data.ip,
                (long long)data.period);
 
-       thread = threads__findnew(event->ip.pid);
+       thread = perf_session__findnew(session, event->ip.pid);
        if (thread == NULL) {
                pr_debug("problem processing %d event, skipping it.\n",
                         event->header.type);
@@ -344,11 +342,9 @@ static int process_sample_event(event_t *event, struct perf_session *session __u
        return 0;
 }
 
-static int sample_type_check(u64 type)
+static int sample_type_check(struct perf_session *session)
 {
-       sample_type = type;
-
-       if (!(sample_type & PERF_SAMPLE_RAW)) {
+       if (!(session->sample_type & PERF_SAMPLE_RAW)) {
                fprintf(stderr,
                        "No trace sample to read. Did you call perf record "
                        "without -R?");
@@ -364,21 +360,6 @@ static struct perf_event_ops event_ops = {
        .sample_type_check      = sample_type_check,
 };
 
-static int read_events(void)
-{
-       int err;
-       struct perf_session *session = perf_session__new(input_name, O_RDONLY, 0);
-
-       if (session == NULL)
-               return -ENOMEM;
-
-       register_idle_thread();
-       err = perf_session__process_events(session, &event_ops, 0,
-                                          &event__cwdlen, &event__cwd);
-       perf_session__delete(session);
-       return err;
-}
-
 static double fragmentation(unsigned long n_req, unsigned long n_alloc)
 {
        if (n_alloc == 0)
@@ -387,7 +368,8 @@ static double fragmentation(unsigned long n_req, unsigned long n_alloc)
                return 100.0 - (100.0 * n_req / n_alloc);
 }
 
-static void __print_result(struct rb_root *root, int n_lines, int is_caller)
+static void __print_result(struct rb_root *root, struct perf_session *session,
+                          int n_lines, int is_caller)
 {
        struct rb_node *next;
 
@@ -408,7 +390,7 @@ static void __print_result(struct rb_root *root, int n_lines, int is_caller)
                if (is_caller) {
                        addr = data->call_site;
                        if (!raw_ip)
-                               sym = map_groups__find_function(kmaps, addr, NULL);
+                               sym = map_groups__find_function(&session->kmaps, session, addr, NULL);
                } else
                        addr = data->ptr;
 
@@ -449,12 +431,12 @@ static void print_summary(void)
        printf("Cross CPU allocations: %lu/%lu\n", nr_cross_allocs, nr_allocs);
 }
 
-static void print_result(void)
+static void print_result(struct perf_session *session)
 {
        if (caller_flag)
-               __print_result(&root_caller_sorted, caller_lines, 1);
+               __print_result(&root_caller_sorted, session, caller_lines, 1);
        if (alloc_flag)
-               __print_result(&root_alloc_sorted, alloc_lines, 0);
+               __print_result(&root_alloc_sorted, session, alloc_lines, 0);
        print_summary();
 }
 
@@ -522,12 +504,20 @@ static void sort_result(void)
 
 static int __cmd_kmem(void)
 {
+       int err;
+       struct perf_session *session = perf_session__new(input_name, O_RDONLY, 0);
+       if (session == NULL)
+               return -ENOMEM;
+
        setup_pager();
-       read_events();
+       err = perf_session__process_events(session, &event_ops);
+       if (err != 0)
+               goto out_delete;
        sort_result();
-       print_result();
-
-       return 0;
+       print_result(session);
+out_delete:
+       perf_session__delete(session);
+       return err;
 }
 
 static const char * const kmem_usage[] = {
@@ -776,13 +766,13 @@ static int __cmd_record(int argc, const char **argv)
 
 int cmd_kmem(int argc, const char **argv, const char *prefix __used)
 {
-       symbol__init(0);
-
        argc = parse_options(argc, argv, kmem_options, kmem_usage, 0);
 
        if (!argc)
                usage_with_options(kmem_usage, kmem_options);
 
+       symbol__init();
+
        if (!strncmp(argv[0], "rec", 3)) {
                return __cmd_record(argc, argv);
        } else if (!strcmp(argv[0], "stat")) {