perf evlist: Rename for_each() macros to for_each_entry()

[deliverable/linux.git] / tools / perf / util / intel-pt.c

diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index 6175784409896425154dcfd9c49560e9f2cb7e28..dc243b19197b10f912008ad333788ee1edeb2699 100644 (file)
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -39,6 +39,7 @@
 #include "auxtrace.h"
 #include "tsc.h"
 #include "intel-pt.h"
+#include "config.h"
 
 #include "intel-pt-decoder/intel-pt-log.h"
 #include "intel-pt-decoder/intel-pt-decoder.h"
@@ -100,6 +101,8 @@ struct intel_pt {
        u64 cyc_bit;
        u64 noretcomp_bit;
        unsigned max_non_turbo_ratio;
+
+       unsigned long num_events;
 };
 
 enum switch_state {
@@ -554,7 +557,7 @@ static bool intel_pt_exclude_kernel(struct intel_pt *pt)
 {
        struct perf_evsel *evsel;
 
-       evlist__for_each(pt->session->evlist, evsel) {
+       evlist__for_each_entry(pt->session->evlist, evsel) {
                if (intel_pt_get_config(pt, &evsel->attr, NULL) &&
                    !evsel->attr.exclude_kernel)
                        return false;
@@ -570,7 +573,7 @@ static bool intel_pt_return_compression(struct intel_pt *pt)
        if (!pt->noretcomp_bit)
                return true;
 
-       evlist__for_each(pt->session->evlist, evsel) {
+       evlist__for_each_entry(pt->session->evlist, evsel) {
                if (intel_pt_get_config(pt, &evsel->attr, &config) &&
                    (config & pt->noretcomp_bit))
                        return false;
@@ -590,7 +593,7 @@ static unsigned int intel_pt_mtc_period(struct intel_pt *pt)
        for (shift = 0, config = pt->mtc_freq_bits; !(config & 1); shift++)
                config >>= 1;
 
-       evlist__for_each(pt->session->evlist, evsel) {
+       evlist__for_each_entry(pt->session->evlist, evsel) {
                if (intel_pt_get_config(pt, &evsel->attr, &config))
                        return (config & pt->mtc_freq_bits) >> shift;
        }
@@ -606,7 +609,7 @@ static bool intel_pt_timeless_decoding(struct intel_pt *pt)
        if (!pt->tsc_bit || !pt->cap_user_time_zero)
                return true;
 
-       evlist__for_each(pt->session->evlist, evsel) {
+       evlist__for_each_entry(pt->session->evlist, evsel) {
                if (!(evsel->attr.sample_type & PERF_SAMPLE_TIME))
                        return true;
                if (intel_pt_get_config(pt, &evsel->attr, &config)) {
@@ -623,7 +626,7 @@ static bool intel_pt_tracing_kernel(struct intel_pt *pt)
 {
        struct perf_evsel *evsel;
 
-       evlist__for_each(pt->session->evlist, evsel) {
+       evlist__for_each_entry(pt->session->evlist, evsel) {
                if (intel_pt_get_config(pt, &evsel->attr, NULL) &&
                    !evsel->attr.exclude_kernel)
                        return true;
@@ -640,7 +643,7 @@ static bool intel_pt_have_tsc(struct intel_pt *pt)
        if (!pt->tsc_bit)
                return false;
 
-       evlist__for_each(pt->session->evlist, evsel) {
+       evlist__for_each_entry(pt->session->evlist, evsel) {
                if (intel_pt_get_config(pt, &evsel->attr, &config)) {
                        if (config & pt->tsc_bit)
                                have_tsc = true;
@@ -972,6 +975,10 @@ static int intel_pt_synth_branch_sample(struct intel_pt_queue *ptq)
        if (pt->branches_filter && !(pt->branches_filter & ptq->flags))
                return 0;
 
+       if (pt->synth_opts.initial_skip &&
+           pt->num_events++ < pt->synth_opts.initial_skip)
+               return 0;
+
        event->sample.header.type = PERF_RECORD_SAMPLE;
        event->sample.header.misc = PERF_RECORD_MISC_USER;
        event->sample.header.size = sizeof(struct perf_event_header);
@@ -1029,6 +1036,10 @@ static int intel_pt_synth_instruction_sample(struct intel_pt_queue *ptq)
        union perf_event *event = ptq->event_buf;
        struct perf_sample sample = { .ip = 0, };
 
+       if (pt->synth_opts.initial_skip &&
+           pt->num_events++ < pt->synth_opts.initial_skip)
+               return 0;
+
        event->sample.header.type = PERF_RECORD_SAMPLE;
        event->sample.header.misc = PERF_RECORD_MISC_USER;
        event->sample.header.size = sizeof(struct perf_event_header);
@@ -1087,6 +1098,10 @@ static int intel_pt_synth_transaction_sample(struct intel_pt_queue *ptq)
        union perf_event *event = ptq->event_buf;
        struct perf_sample sample = { .ip = 0, };
 
+       if (pt->synth_opts.initial_skip &&
+           pt->num_events++ < pt->synth_opts.initial_skip)
+               return 0;
+
        event->sample.header.type = PERF_RECORD_SAMPLE;
        event->sample.header.misc = PERF_RECORD_MISC_USER;
        event->sample.header.size = sizeof(struct perf_event_header);
@@ -1199,14 +1214,18 @@ static int intel_pt_sample(struct intel_pt_queue *ptq)
        ptq->have_sample = false;
 
        if (pt->sample_instructions &&
-           (state->type & INTEL_PT_INSTRUCTION)) {
+           (state->type & INTEL_PT_INSTRUCTION) &&
+           (!pt->synth_opts.initial_skip ||
+            pt->num_events++ >= pt->synth_opts.initial_skip)) {
                err = intel_pt_synth_instruction_sample(ptq);
                if (err)
                        return err;
        }
 
        if (pt->sample_transactions &&
-           (state->type & INTEL_PT_TRANSACTION)) {
+           (state->type & INTEL_PT_TRANSACTION) &&
+           (!pt->synth_opts.initial_skip ||
+            pt->num_events++ >= pt->synth_opts.initial_skip)) {
                err = intel_pt_synth_transaction_sample(ptq);
                if (err)
                        return err;
@@ -1832,7 +1851,7 @@ static int intel_pt_synth_events(struct intel_pt *pt,
        u64 id;
        int err;
 
-       evlist__for_each(evlist, evsel) {
+       evlist__for_each_entry(evlist, evsel) {
                if (evsel->attr.type == pt->pmu_type && evsel->ids) {
                        found = true;
                        break;
@@ -1912,7 +1931,7 @@ static int intel_pt_synth_events(struct intel_pt *pt,
                pt->sample_transactions = true;
                pt->transactions_id = id;
                id += 1;
-               evlist__for_each(evlist, evsel) {
+               evlist__for_each_entry(evlist, evsel) {
                        if (evsel->id && evsel->id[0] == pt->transactions_id) {
                                if (evsel->name)
                                        zfree(&evsel->name);
@@ -1950,7 +1969,7 @@ static struct perf_evsel *intel_pt_find_sched_switch(struct perf_evlist *evlist)
 {
        struct perf_evsel *evsel;
 
-       evlist__for_each_reverse(evlist, evsel) {
+       evlist__for_each_entry_reverse(evlist, evsel) {
                const char *name = perf_evsel__name(evsel);
 
                if (!strcmp(name, "sched:sched_switch"))
@@ -1964,7 +1983,7 @@ static bool intel_pt_find_switch(struct perf_evlist *evlist)
 {
        struct perf_evsel *evsel;
 
-       evlist__for_each(evlist, evsel) {
+       evlist__for_each_entry(evlist, evsel) {
                if (evsel->attr.context_switch)
                        return true;
        }