Commit 9ed8b7dc authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo

perf pmu-events: Change deprecated to be a bool

Switch to a more natural bool rather than string encoding, where NULL
implicitly meant false.
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Eduard Zingerman <eddyz87@gmail.com>
Cc: Florian Fischer <florian.fischer@muhq.space>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Perry Taylor <perry.taylor@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-stm32@st-md-mailman.stormreply.com
Link: https://lore.kernel.org/r/20230219092848.639226-6-irogers@google.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1fa0c371
...@@ -678,7 +678,7 @@ static void decompress_event(int offset, struct pmu_event *pe) ...@@ -678,7 +678,7 @@ static void decompress_event(int offset, struct pmu_event *pe)
{ {
\tconst char *p = &big_c_string[offset]; \tconst char *p = &big_c_string[offset];
""") """)
enum_attributes = ['aggr_mode'] enum_attributes = ['aggr_mode', 'deprecated']
for attr in _json_event_attributes: for attr in _json_event_attributes:
_args.output_file.write(f'\n\tpe->{attr} = ') _args.output_file.write(f'\n\tpe->{attr} = ')
if attr in enum_attributes: if attr in enum_attributes:
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
#ifndef PMU_EVENTS_H #ifndef PMU_EVENTS_H
#define PMU_EVENTS_H #define PMU_EVENTS_H
#include <stdbool.h>
struct perf_pmu; struct perf_pmu;
enum aggr_mode_class { enum aggr_mode_class {
...@@ -22,7 +24,7 @@ struct pmu_event { ...@@ -22,7 +24,7 @@ struct pmu_event {
const char *pmu; const char *pmu;
const char *unit; const char *unit;
const char *perpkg; const char *perpkg;
const char *deprecated; bool deprecated;
}; };
struct pmu_metric { struct pmu_metric {
......
...@@ -331,8 +331,8 @@ static int compare_pmu_events(const struct pmu_event *e1, const struct pmu_event ...@@ -331,8 +331,8 @@ static int compare_pmu_events(const struct pmu_event *e1, const struct pmu_event
return -1; return -1;
} }
if (!is_same(e1->deprecated, e2->deprecated)) { if (e1->deprecated != e2->deprecated) {
pr_debug2("testing event e1 %s: mismatched deprecated, %s vs %s\n", pr_debug2("testing event e1 %s: mismatched deprecated, %d vs %d\n",
e1->name, e1->deprecated, e2->deprecated); e1->name, e1->deprecated, e2->deprecated);
return -1; return -1;
} }
......
...@@ -331,14 +331,15 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name, ...@@ -331,14 +331,15 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name,
int num; int num;
char newval[256]; char newval[256];
char *long_desc = NULL, *topic = NULL, *unit = NULL, *perpkg = NULL, char *long_desc = NULL, *topic = NULL, *unit = NULL, *perpkg = NULL,
*deprecated = NULL, *pmu_name = NULL; *pmu_name = NULL;
bool deprecated = false;
if (pe) { if (pe) {
long_desc = (char *)pe->long_desc; long_desc = (char *)pe->long_desc;
topic = (char *)pe->topic; topic = (char *)pe->topic;
unit = (char *)pe->unit; unit = (char *)pe->unit;
perpkg = (char *)pe->perpkg; perpkg = (char *)pe->perpkg;
deprecated = (char *)pe->deprecated; deprecated = pe->deprecated;
pmu_name = (char *)pe->pmu; pmu_name = (char *)pe->pmu;
} }
...@@ -351,7 +352,7 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name, ...@@ -351,7 +352,7 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name,
alias->unit[0] = '\0'; alias->unit[0] = '\0';
alias->per_pkg = false; alias->per_pkg = false;
alias->snapshot = false; alias->snapshot = false;
alias->deprecated = false; alias->deprecated = deprecated;
ret = parse_events_terms(&alias->terms, val); ret = parse_events_terms(&alias->terms, val);
if (ret) { if (ret) {
...@@ -405,9 +406,6 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name, ...@@ -405,9 +406,6 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name,
alias->str = strdup(newval); alias->str = strdup(newval);
alias->pmu_name = pmu_name ? strdup(pmu_name) : NULL; alias->pmu_name = pmu_name ? strdup(pmu_name) : NULL;
if (deprecated)
alias->deprecated = true;
if (!perf_pmu_merge_alias(alias, list)) if (!perf_pmu_merge_alias(alias, list))
list_add_tail(&alias->list, list); list_add_tail(&alias->list, list);
......
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