On Tue, Dec 24, 2013 at 05:22:07PM +0900, Namhyung Kim wrote:
> From: Namhyung Kim <[email protected]>

SNIP

> @@ -239,6 +426,7 @@ static int process_sample_event(struct perf_tool *tool,
>  {
>       struct report *rep = container_of(tool, struct report, tool);
>       struct addr_location al;
> +     struct add_entry_iter *iter;
>       int ret;
>  
>       if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) {
> @@ -253,22 +441,22 @@ static int process_sample_event(struct perf_tool *tool,
>       if (rep->cpu_list && !test_bit(sample->cpu, rep->cpu_bitmap))
>               return 0;
>  
> -     if (sort__mode == SORT_MODE__BRANCH) {
> -             ret = report__add_branch_hist_entry(tool, &al, sample, evsel);
> -             if (ret < 0)
> -                     pr_debug("problem adding lbr entry, skipping event\n");
> -     } else if (rep->mem_mode == 1) {
> -             ret = report__add_mem_hist_entry(tool, &al, sample, evsel, 
> event);
> -             if (ret < 0)
> -                     pr_debug("problem adding mem entry, skipping event\n");
> -     } else {
> -             if (al.map != NULL)
> -                     al.map->dso->hit = 1;
> -
> -             ret = report__add_hist_entry(tool, evsel, &al, sample);
> -             if (ret < 0)
> -                     pr_debug("problem incrementing symbol period, skipping 
> event\n");
> -     }
> +     if (sort__mode == SORT_MODE__BRANCH)
> +             iter = &branch_iter;
> +     else if (rep->mem_mode == 1) {
> +             iter = &mem_iter;
> +             iter->priv = event;
> +     } else
> +             iter = &normal_iter;
> +
> +     if (al.map != NULL)
> +             al.map->dso->hit = 1;
> +
> +     iter->rep = rep;
> +     ret = perf_evsel__add_entry(evsel, &al, sample, machine, iter);

you dont need to pass machine pointer, it's already in 'al'

jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to