Commit 329725d5 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo

perf evlist: Add evlist__{en/dis}able_non_dummy()

Dummy events are used to provide sideband information like MMAP events that
are always needed even when main events are disabled. Add functions that
take that into account.
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20220824072814.16422-5-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent feff0b61
...@@ -480,7 +480,7 @@ static int evlist__is_enabled(struct evlist *evlist) ...@@ -480,7 +480,7 @@ static int evlist__is_enabled(struct evlist *evlist)
return false; return false;
} }
static void __evlist__disable(struct evlist *evlist, char *evsel_name) static void __evlist__disable(struct evlist *evlist, char *evsel_name, bool excl_dummy)
{ {
struct evsel *pos; struct evsel *pos;
struct evlist_cpu_iterator evlist_cpu_itr; struct evlist_cpu_iterator evlist_cpu_itr;
...@@ -502,6 +502,8 @@ static void __evlist__disable(struct evlist *evlist, char *evsel_name) ...@@ -502,6 +502,8 @@ static void __evlist__disable(struct evlist *evlist, char *evsel_name)
continue; continue;
if (pos->disabled || !evsel__is_group_leader(pos) || !pos->core.fd) if (pos->disabled || !evsel__is_group_leader(pos) || !pos->core.fd)
continue; continue;
if (excl_dummy && evsel__is_dummy_event(pos))
continue;
if (pos->immediate) if (pos->immediate)
has_imm = true; has_imm = true;
if (pos->immediate != imm) if (pos->immediate != imm)
...@@ -518,6 +520,8 @@ static void __evlist__disable(struct evlist *evlist, char *evsel_name) ...@@ -518,6 +520,8 @@ static void __evlist__disable(struct evlist *evlist, char *evsel_name)
continue; continue;
if (!evsel__is_group_leader(pos) || !pos->core.fd) if (!evsel__is_group_leader(pos) || !pos->core.fd)
continue; continue;
if (excl_dummy && evsel__is_dummy_event(pos))
continue;
pos->disabled = true; pos->disabled = true;
} }
...@@ -533,15 +537,20 @@ static void __evlist__disable(struct evlist *evlist, char *evsel_name) ...@@ -533,15 +537,20 @@ static void __evlist__disable(struct evlist *evlist, char *evsel_name)
void evlist__disable(struct evlist *evlist) void evlist__disable(struct evlist *evlist)
{ {
__evlist__disable(evlist, NULL); __evlist__disable(evlist, NULL, false);
}
void evlist__disable_non_dummy(struct evlist *evlist)
{
__evlist__disable(evlist, NULL, true);
} }
void evlist__disable_evsel(struct evlist *evlist, char *evsel_name) void evlist__disable_evsel(struct evlist *evlist, char *evsel_name)
{ {
__evlist__disable(evlist, evsel_name); __evlist__disable(evlist, evsel_name, false);
} }
static void __evlist__enable(struct evlist *evlist, char *evsel_name) static void __evlist__enable(struct evlist *evlist, char *evsel_name, bool excl_dummy)
{ {
struct evsel *pos; struct evsel *pos;
struct evlist_cpu_iterator evlist_cpu_itr; struct evlist_cpu_iterator evlist_cpu_itr;
...@@ -560,6 +569,8 @@ static void __evlist__enable(struct evlist *evlist, char *evsel_name) ...@@ -560,6 +569,8 @@ static void __evlist__enable(struct evlist *evlist, char *evsel_name)
continue; continue;
if (!evsel__is_group_leader(pos) || !pos->core.fd) if (!evsel__is_group_leader(pos) || !pos->core.fd)
continue; continue;
if (excl_dummy && evsel__is_dummy_event(pos))
continue;
evsel__enable_cpu(pos, evlist_cpu_itr.cpu_map_idx); evsel__enable_cpu(pos, evlist_cpu_itr.cpu_map_idx);
} }
affinity__cleanup(affinity); affinity__cleanup(affinity);
...@@ -568,6 +579,8 @@ static void __evlist__enable(struct evlist *evlist, char *evsel_name) ...@@ -568,6 +579,8 @@ static void __evlist__enable(struct evlist *evlist, char *evsel_name)
continue; continue;
if (!evsel__is_group_leader(pos) || !pos->core.fd) if (!evsel__is_group_leader(pos) || !pos->core.fd)
continue; continue;
if (excl_dummy && evsel__is_dummy_event(pos))
continue;
pos->disabled = false; pos->disabled = false;
} }
...@@ -581,12 +594,17 @@ static void __evlist__enable(struct evlist *evlist, char *evsel_name) ...@@ -581,12 +594,17 @@ static void __evlist__enable(struct evlist *evlist, char *evsel_name)
void evlist__enable(struct evlist *evlist) void evlist__enable(struct evlist *evlist)
{ {
__evlist__enable(evlist, NULL); __evlist__enable(evlist, NULL, false);
}
void evlist__enable_non_dummy(struct evlist *evlist)
{
__evlist__enable(evlist, NULL, true);
} }
void evlist__enable_evsel(struct evlist *evlist, char *evsel_name) void evlist__enable_evsel(struct evlist *evlist, char *evsel_name)
{ {
__evlist__enable(evlist, evsel_name); __evlist__enable(evlist, evsel_name, false);
} }
void evlist__toggle_enable(struct evlist *evlist) void evlist__toggle_enable(struct evlist *evlist)
......
...@@ -205,6 +205,8 @@ void evlist__enable(struct evlist *evlist); ...@@ -205,6 +205,8 @@ void evlist__enable(struct evlist *evlist);
void evlist__toggle_enable(struct evlist *evlist); void evlist__toggle_enable(struct evlist *evlist);
void evlist__disable_evsel(struct evlist *evlist, char *evsel_name); void evlist__disable_evsel(struct evlist *evlist, char *evsel_name);
void evlist__enable_evsel(struct evlist *evlist, char *evsel_name); void evlist__enable_evsel(struct evlist *evlist, char *evsel_name);
void evlist__disable_non_dummy(struct evlist *evlist);
void evlist__enable_non_dummy(struct evlist *evlist);
void evlist__set_selected(struct evlist *evlist, struct evsel *evsel); void evlist__set_selected(struct evlist *evlist, struct evsel *evsel);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment