Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf trace: Rename delivery functions to ease making ordered_events selectable

Just hide a bit more how events gets delivered, hiding ordered_events
details from the main loop.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-lxwwf3238ta4neq2zh1y1h45@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+7 -7
+7 -7
tools/perf/builtin-trace.c
··· 2641 2641 return err; 2642 2642 } 2643 2643 2644 - static int trace__deliver_event(struct trace *trace, union perf_event *event) 2644 + static int __trace__deliver_event(struct trace *trace, union perf_event *event) 2645 2645 { 2646 2646 struct perf_evlist *evlist = trace->evlist; 2647 2647 struct perf_sample sample; ··· 2656 2656 return 0; 2657 2657 } 2658 2658 2659 - static int trace__flush_ordered_events(struct trace *trace) 2659 + static int trace__flush_events(struct trace *trace) 2660 2660 { 2661 2661 u64 first = ordered_events__first_time(&trace->oe.data); 2662 2662 u64 flush = trace->oe.last - NSEC_PER_SEC; ··· 2668 2668 return 0; 2669 2669 } 2670 2670 2671 - static int trace__deliver_ordered_event(struct trace *trace, union perf_event *event) 2671 + static int trace__deliver_event(struct trace *trace, union perf_event *event) 2672 2672 { 2673 2673 struct perf_evlist *evlist = trace->evlist; 2674 2674 int err; ··· 2681 2681 if (err) 2682 2682 return err; 2683 2683 2684 - return trace__flush_ordered_events(trace); 2684 + return trace__flush_events(trace); 2685 2685 } 2686 2686 2687 2687 static int ordered_events__deliver_event(struct ordered_events *oe, ··· 2689 2689 { 2690 2690 struct trace *trace = container_of(oe, struct trace, oe.data); 2691 2691 2692 - return trace__deliver_event(trace, event->event); 2692 + return __trace__deliver_event(trace, event->event); 2693 2693 } 2694 2694 2695 2695 static int trace__run(struct trace *trace, int argc, const char **argv) ··· 2859 2859 while ((event = perf_mmap__read_event(md)) != NULL) { 2860 2860 ++trace->nr_events; 2861 2861 2862 - err = trace__deliver_ordered_event(trace, event); 2862 + err = trace__deliver_event(trace, event); 2863 2863 if (err) 2864 2864 goto out_disable; 2865 2865 ··· 2885 2885 2886 2886 goto again; 2887 2887 } else { 2888 - if (trace__flush_ordered_events(trace)) 2888 + if (trace__flush_events(trace)) 2889 2889 goto out_disable; 2890 2890 } 2891 2891 } else {