lkml.org 
[lkml]   [2016]   [Jan]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/13] perf tools: Remove perf_evlist__(enable|disable)_event functions
    Date
    Replacing them with perf_evsel__(enable|disable).

    Link: http://lkml.kernel.org/n/tip-bbyjpha9wc4ifn0ebfkm0mnl@git.kernel.org
    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    ---
    tools/perf/arch/x86/util/intel-bts.c | 4 ++--
    tools/perf/arch/x86/util/intel-pt.c | 4 ++--
    tools/perf/tests/keep-tracking.c | 2 +-
    tools/perf/tests/switch-tracking.c | 6 +++---
    tools/perf/util/evlist.c | 42 ------------------------------------
    tools/perf/util/evlist.h | 4 ----
    6 files changed, 8 insertions(+), 54 deletions(-)

    diff --git a/tools/perf/arch/x86/util/intel-bts.c b/tools/perf/arch/x86/util/intel-bts.c
    index 9b94ce520917..8d8150f1cf9b 100644
    --- a/tools/perf/arch/x86/util/intel-bts.c
    +++ b/tools/perf/arch/x86/util/intel-bts.c
    @@ -327,7 +327,7 @@ static int intel_bts_snapshot_start(struct auxtrace_record *itr)

    evlist__for_each(btsr->evlist, evsel) {
    if (evsel->attr.type == btsr->intel_bts_pmu->type)
    - return perf_evlist__disable_event(btsr->evlist, evsel);
    + return perf_evsel__disable(evsel);
    }
    return -EINVAL;
    }
    @@ -340,7 +340,7 @@ static int intel_bts_snapshot_finish(struct auxtrace_record *itr)

    evlist__for_each(btsr->evlist, evsel) {
    if (evsel->attr.type == btsr->intel_bts_pmu->type)
    - return perf_evlist__enable_event(btsr->evlist, evsel);
    + return perf_evsel__enable(evsel);
    }
    return -EINVAL;
    }
    diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
    index b64d46285ebb..f05daacc9e78 100644
    --- a/tools/perf/arch/x86/util/intel-pt.c
    +++ b/tools/perf/arch/x86/util/intel-pt.c
    @@ -725,7 +725,7 @@ static int intel_pt_snapshot_start(struct auxtrace_record *itr)

    evlist__for_each(ptr->evlist, evsel) {
    if (evsel->attr.type == ptr->intel_pt_pmu->type)
    - return perf_evlist__disable_event(ptr->evlist, evsel);
    + return perf_evsel__disable(evsel);
    }
    return -EINVAL;
    }
    @@ -738,7 +738,7 @@ static int intel_pt_snapshot_finish(struct auxtrace_record *itr)

    evlist__for_each(ptr->evlist, evsel) {
    if (evsel->attr.type == ptr->intel_pt_pmu->type)
    - return perf_evlist__enable_event(ptr->evlist, evsel);
    + return perf_evsel__enable(evsel);
    }
    return -EINVAL;
    }
    diff --git a/tools/perf/tests/keep-tracking.c b/tools/perf/tests/keep-tracking.c
    index a337a6da1f39..7b27943ecfef 100644
    --- a/tools/perf/tests/keep-tracking.c
    +++ b/tools/perf/tests/keep-tracking.c
    @@ -124,7 +124,7 @@ int test__keep_tracking(int subtest __maybe_unused)

    evsel = perf_evlist__last(evlist);

    - CHECK__(perf_evlist__disable_event(evlist, evsel));
    + CHECK__(perf_evsel__disable(evsel));

    comm = "Test COMM 2";
    CHECK__(prctl(PR_SET_NAME, (unsigned long)comm, 0, 0, 0));
    diff --git a/tools/perf/tests/switch-tracking.c b/tools/perf/tests/switch-tracking.c
    index dfbd8d69ce89..ebd80168d51e 100644
    --- a/tools/perf/tests/switch-tracking.c
    +++ b/tools/perf/tests/switch-tracking.c
    @@ -455,7 +455,7 @@ int test__switch_tracking(int subtest __maybe_unused)

    perf_evlist__enable(evlist);

    - err = perf_evlist__disable_event(evlist, cpu_clocks_evsel);
    + err = perf_evsel__disable(cpu_clocks_evsel);
    if (err) {
    pr_debug("perf_evlist__disable_event failed!\n");
    goto out_err;
    @@ -474,7 +474,7 @@ int test__switch_tracking(int subtest __maybe_unused)
    goto out_err;
    }

    - err = perf_evlist__disable_event(evlist, cycles_evsel);
    + err = perf_evsel__disable(cycles_evsel);
    if (err) {
    pr_debug("perf_evlist__disable_event failed!\n");
    goto out_err;
    @@ -500,7 +500,7 @@ int test__switch_tracking(int subtest __maybe_unused)
    goto out_err;
    }

    - err = perf_evlist__enable_event(evlist, cycles_evsel);
    + err = perf_evsel__enable(cycles_evsel);
    if (err) {
    pr_debug("perf_evlist__disable_event failed!\n");
    goto out_err;
    diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
    index b9eac0daa0b9..05efa910a090 100644
    --- a/tools/perf/util/evlist.c
    +++ b/tools/perf/util/evlist.c
    @@ -365,48 +365,6 @@ void perf_evlist__toggle_enable(struct perf_evlist *evlist)
    (evlist->enabled ? perf_evlist__disable : perf_evlist__enable)(evlist);
    }

    -int perf_evlist__disable_event(struct perf_evlist *evlist,
    - struct perf_evsel *evsel)
    -{
    - int cpu, thread, err;
    - int nr_cpus = cpu_map__nr(evlist->cpus);
    - int nr_threads = perf_evlist__nr_threads(evlist, evsel);
    -
    - if (!evsel->fd)
    - return 0;
    -
    - for (cpu = 0; cpu < nr_cpus; cpu++) {
    - for (thread = 0; thread < nr_threads; thread++) {
    - err = ioctl(FD(evsel, cpu, thread),
    - PERF_EVENT_IOC_DISABLE, 0);
    - if (err)
    - return err;
    - }
    - }
    - return 0;
    -}
    -
    -int perf_evlist__enable_event(struct perf_evlist *evlist,
    - struct perf_evsel *evsel)
    -{
    - int cpu, thread, err;
    - int nr_cpus = cpu_map__nr(evlist->cpus);
    - int nr_threads = perf_evlist__nr_threads(evlist, evsel);
    -
    - if (!evsel->fd)
    - return -EINVAL;
    -
    - for (cpu = 0; cpu < nr_cpus; cpu++) {
    - for (thread = 0; thread < nr_threads; thread++) {
    - err = ioctl(FD(evsel, cpu, thread),
    - PERF_EVENT_IOC_ENABLE, 0);
    - if (err)
    - return err;
    - }
    - }
    - return 0;
    -}
    -
    static int perf_evlist__enable_event_cpu(struct perf_evlist *evlist,
    struct perf_evsel *evsel, int cpu)
    {
    diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
    index 139a50038097..25c6c824d870 100644
    --- a/tools/perf/util/evlist.h
    +++ b/tools/perf/util/evlist.h
    @@ -152,10 +152,6 @@ void perf_evlist__disable(struct perf_evlist *evlist);
    void perf_evlist__enable(struct perf_evlist *evlist);
    void perf_evlist__toggle_enable(struct perf_evlist *evlist);

    -int perf_evlist__disable_event(struct perf_evlist *evlist,
    - struct perf_evsel *evsel);
    -int perf_evlist__enable_event(struct perf_evlist *evlist,
    - struct perf_evsel *evsel);
    int perf_evlist__enable_event_idx(struct perf_evlist *evlist,
    struct perf_evsel *evsel, int idx);

    --
    2.4.3


    \
     
     \ /
      Last update: 2016-01-07 11:01    [W:4.196 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site