Fix missing caps, fix unnecessary casting/checking
Subsystems (2)
Ian Rogers
reviewerv2 cover Fix missing caps, fix unnecessary casting/checking
Wei Li <[email protected]> reported an issue where writing PMU caps for ARM was broken. Patch 1 addresses this issue.
Patch 2 removes unnecessary checks on a PMU's name by ensuring the fake PMU has a name. Types are updated to have a const as a consequence and a cleanup of the use of types is done for struct pmu's variable name. This was motivated by the discussion:
https://lore.kernel.org/lkml/[email protected]/
Patches 3-5 repeat the const cleanup on struct pmu's name with the variables id and config in struct pmu and struct parse_events_term respectively. This is done for consistency with patch 2.
Patch 6 tidies casts around libslang and removes workarounds for libslang support needed for a libslang older than 15 years - let's say nobody cares about a libslang that is this old.
Ian Rogers (6):
perf header: Fix missing PMU caps
perf pmu: Remove logic for PMU name being NULL perf parse-events: Make term's config const perf pmu: Make id const and add missing free perf build-id: Simplify build_id_cache__cachedir perf tui slang: Tidy casts
tools/perf/arch/arm64/util/mem-events.c | 2 +- tools/perf/arch/powerpc/util/mem-events.c | 6 ++-- tools/perf/arch/x86/util/mem-events.c | 8 ++--- tools/perf/arch/x86/util/pmu.c | 10 +++--- tools/perf/builtin-list.c | 2 +- tools/perf/tests/pmu-events.c | 20 ++++++------ tools/perf/tests/pmu.c | 18 +++++------ tools/perf/ui/Build | 2 -- tools/perf/ui/browser.c | 6 ++-- tools/perf/ui/browsers/Build | 5 --- tools/perf/ui/libslang.h | 20 +++--------- tools/perf/ui/tui/helpline.c | 2 +- tools/perf/ui/tui/setup.c | 2 +- tools/perf/ui/tui/util.c | 12 +++---- tools/perf/util/build-id.c | 6 ++-- tools/perf/util/env.c | 8 ++--- tools/perf/util/header.c | 39 ++++++++++------------- tools/perf/util/mem-events.c | 16 +++++----- tools/perf/util/mem-events.h | 2 +- tools/perf/util/parse-events.c | 17 ++++------ tools/perf/util/parse-events.h | 6 ++-- tools/perf/util/parse-events.y | 2 +- tools/perf/util/pmu.c | 19 ++++++----- tools/perf/util/pmu.h | 10 +++--- 24 files changed, 105 insertions(+), 135 deletions(-)
Signature · 7 lines
2.42.0.rc2.253.gd59a3bf2b4-goog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Ian Rogers
reviewerPATCH v2 1/6 perf header: Fix missing PMU caps
PMU caps are written as HEADER_PMU_CAPS or for the special case of the PMU "cpu" as HEADER_CPU_PMU_CAPS. As the PMU "cpu" is special, and not any "core" PMU, the logic had become broken and core PMUs not called "cpu" were not having their caps written. This affects ARM and s390 non-hybrid PMUs.
Simplify the PMU caps writing logic to scan one fewer time and to be more explicit in its behavior.
--- tools/perf/util/header.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
tools/perf/util/header.c +16 -15
@@ -1605,8 +1605,15 @@ static int write_pmu_caps(struct feat_fd *ff,int ret;while ((pmu =perf_pmus__scan (pmu))) { -if (!pmu->name || !strcmp (pmu->name,"cpu" ) || -perf_pmu__caps_parse (pmu) <=0 ) +if (!strcmp (pmu->name,"cpu" )) { +/* +* The "cpu" PMU is special and covered by +* HEADER_CPU_PMU_CAPS. Note, core PMUs are +* counted/written here for ARM, s390 and Intel hybrid. +*/ +continue ; + } +if (perf_pmu__caps_parse (pmu) <=0 )continue ; nr_pmu++; }
@@ -1619,23 +1626,17 @@ static int write_pmu_caps(struct feat_fd *ff,return 0 ;/* -* Write hybrid pmu caps first to maintain compatibility with -* older perf tool. +* Note older perf tools assume core PMUs come first, this is a property +* of perf_pmus__scan. */ -if (perf_pmus__num_core_pmus () >1 ) { - pmu =NULL ; -while ((pmu =perf_pmus__scan_core (pmu))) { - ret =__write_pmu_caps (ff, pmu, true); -if (ret <0 ) -return ret; - } - } - pmu =NULL ;while ((pmu =perf_pmus__scan (pmu))) { -if (pmu->is_core || !pmu->nr_caps) +if (!strcmp (pmu->name,"cpu" )) { +/* Skip as above. */ +continue ; + } +if (perf_pmu__caps_parse (pmu) <=0 )continue ; - ret =__write_pmu_caps (ff, pmu, true);if (ret <0 )return ret;
Signature · 7 lines
2.42.0.rc2.253.gd59a3bf2b4-goog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Ian Rogers
reviewerPATCH v2 2/6 perf pmu: Remove logic for PMU name being NULL
In reply to Ian RogersThe PMU name could be NULL in the case of the fake_pmu. Initialize the name for the fake_pmu to "fake" so that all other logic can assume it is initialized. Add a const to the type of name so that a literal can be used to avoid additional initialization code. Propagate the cost through related routines and remove now unnecessary "(char *)" casts. Doing this located a bug in builtin-list for the pmu_glob that was missing a strdup.
--- tools/perf/arch/arm64/util/mem-events.c | 2 +- tools/perf/arch/powerpc/util/mem-events.c | 6 +++--- tools/perf/arch/x86/util/mem-events.c | 8 ++++---- tools/perf/arch/x86/util/pmu.c | 10 +++++----- tools/perf/builtin-list.c | 2 +- tools/perf/tests/pmu-events.c | 16 ++++++++-------- tools/perf/util/env.c | 8 ++------ tools/perf/util/header.c | 8 +------- tools/perf/util/mem-events.c | 16 ++++++++-------- tools/perf/util/mem-events.h | 2 +- tools/perf/util/parse-events.c | 7 ++----- tools/perf/util/parse-events.h | 2 +- tools/perf/util/parse-events.y | 2 +- tools/perf/util/pmu.c | 16 +++++++++------- tools/perf/util/pmu.h | 8 ++++---- 15 files changed, 51 insertions(+), 62 deletions(-)
tools/perf/arch/arm64/util/mem-events.c +1 -1
@@ -20,7 +20,7 @@ struct perf_mem_event *perf_mem_events__ptr(int i)return &perf_mem_events[i]; } -char *perf_mem_events__name (int i,char *pmu_name__maybe_unused ) +const char *perf_mem_events__name (int i,const char *pmu_name__maybe_unused ) {struct perf_mem_event *e =perf_mem_events__ptr (i);
tools/perf/arch/powerpc/util/mem-events.c +3 -3
@@ -3,10 +3,10 @@#include "mem-events.h" /* PowerPC does not support 'ldlat' parameter. */ -char *perf_mem_events__name (int i,char *pmu_name__maybe_unused ) +const char *perf_mem_events__name (int i,const char *pmu_name__maybe_unused ) {if (i ==PERF_MEM_EVENTS__LOAD ) -return (char *)"cpu/mem-loads/" ; +return "cpu/mem-loads/" ; -return (char *)"cpu/mem-stores/" ; +return "cpu/mem-stores/" ; }
tools/perf/arch/x86/util/mem-events.c +4 -4
@@ -52,7 +52,7 @@ bool is_mem_loads_aux_event(struct evsel *leader)return leader->core.attr.config ==MEM_LOADS_AUX ; } -char *perf_mem_events__name (int i,char *pmu_name) +const char *perf_mem_events__name (int i,const char *pmu_name) {struct perf_mem_event *e =perf_mem_events__ptr (i);
@@ -65,7 +65,7 @@ char *perf_mem_events__name(int i, char *pmu_name)if (!pmu_name) { mem_loads_name__init = true; - pmu_name = (char *)"cpu" ; + pmu_name ="cpu" ; }if (perf_pmus__have_event (pmu_name,"mem-loads-aux" )) {
@@ -82,12 +82,12 @@ char *perf_mem_events__name(int i, char *pmu_name)if (i ==PERF_MEM_EVENTS__STORE ) {if (!pmu_name) - pmu_name = (char *)"cpu" ; + pmu_name ="cpu" ;scnprintf (mem_stores_name,sizeof (mem_stores_name), e->name, pmu_name);return mem_stores_name; } -return (char *)e->name; +return e->name; }
tools/perf/arch/x86/util/pmu.c +5 -5
@@ -126,7 +126,7 @@ static int setup_pmu_alias_list(void)return ret; } -static char *__pmu_find_real_name (const char *name) +static const char *__pmu_find_real_name (const char *name) {struct pmu_alias *pmu_alias;
@@ -135,10 +135,10 @@ static char *__pmu_find_real_name(const char *name)return pmu_alias->name; } -return (char *)name; +return name; } -char *pmu_find_real_name (const char *name) +const char *pmu_find_real_name (const char *name) {if (cached_list)return __pmu_find_real_name (name);
@@ -149,7 +149,7 @@ char *pmu_find_real_name(const char *name)return __pmu_find_real_name (name); } -static char *__pmu_find_alias_name (const char *name) +static const char *__pmu_find_alias_name (const char *name) {struct pmu_alias *pmu_alias;
@@ -160,7 +160,7 @@ static char *__pmu_find_alias_name(const char *name)return NULL ; } -char *pmu_find_alias_name (const char *name) +const char *pmu_find_alias_name (const char *name) {if (cached_list)return __pmu_find_alias_name (name);
tools/perf/builtin-list.c +1 -1
@@ -502,7 +502,7 @@ int cmd_list(int argc, const char **argv) ret =-1 ; goto out; } - default_ps.pmu_glob = pmu->name; + default_ps.pmu_glob =strdup (pmu->name); } } print_cb.print_start (ps);
tools/perf/tests/pmu-events.c +8 -8
@@ -522,7 +522,7 @@ static int test_core_pmu_event_aliases_cb(void *state, struct pmu_event_info *al }/* Verify aliases are as expected */ -static int __test_core_pmu_event_aliases (char *pmu_name,int *count) +static int __test_core_pmu_event_aliases (const char *pmu_name,int *count) {struct perf_pmu_test_event const **test_event_table;struct perf_pmu *pmu;
@@ -635,7 +635,7 @@ static int __test_uncore_pmu_event_aliases(struct perf_pmu_test_pmu *test_pmu)static struct perf_pmu_test_pmu test_pmus[] = { { .pmu = { - .name = (char *)"hisi_sccl1_ddrc2" , + .name ="hisi_sccl1_ddrc2" , .is_uncore =1 , }, .aliases = {
@@ -644,7 +644,7 @@ static struct perf_pmu_test_pmu test_pmus[] = { }, { .pmu = { - .name = (char *)"uncore_cbox_0", + .name = "uncore_cbox_0", .is_uncore = 1, }, .aliases = {
@@ -655,7 +655,7 @@ static struct perf_pmu_test_pmu test_pmus[] = { }, { .pmu = { - .name = (char *)"hisi_sccl3_l3c7", + .name = "hisi_sccl3_l3c7", .is_uncore = 1, }, .aliases = {
@@ -664,7 +664,7 @@ static struct perf_pmu_test_pmu test_pmus[] = { }, { .pmu = { - .name = (char *)"uncore_imc_free_running_0", + .name = "uncore_imc_free_running_0", .is_uncore = 1, }, .aliases = {
@@ -673,7 +673,7 @@ static struct perf_pmu_test_pmu test_pmus[] = { }, { .pmu = { - .name = (char *)"uncore_imc_0", + .name = "uncore_imc_0", .is_uncore = 1, }, .aliases = {
@@ -682,7 +682,7 @@ static struct perf_pmu_test_pmu test_pmus[] = { }, { .pmu = { - .name = (char *)"uncore_sys_ddr_pmu0", + .name = "uncore_sys_ddr_pmu0", .is_uncore = 1, .id = (char *)"v8", },
@@ -692,7 +692,7 @@ static struct perf_pmu_test_pmu test_pmus[] = { }, { .pmu = { - .name = (char *)"uncore_sys_ccn_pmu4", + .name = "uncore_sys_ccn_pmu4", .is_uncore = 1, .id = (char *)"0x01", },
tools/perf/util/env.c +2 -6
@@ -324,11 +324,9 @@ int perf_env__read_pmu_mappings(struct perf_env *env)u32 pmu_num =0 ;struct strbuf sb; -while ((pmu =perf_pmus__scan (pmu))) { -if (!pmu->name) -continue ; +while ((pmu =perf_pmus__scan (pmu))) pmu_num++; - } +if (!pmu_num) {pr_debug ("pmu mappings not available\n" );return -ENOENT ;
@@ -339,8 +337,6 @@ int perf_env__read_pmu_mappings(struct perf_env *env)return -ENOMEM ;while ((pmu =perf_pmus__scan (pmu))) { -if (!pmu->name) -continue ;if (strbuf_addf (&sb,"%u:%s" , pmu->type, pmu->name) <0 ) goto error;/* include a NULL character at the end */
tools/perf/util/header.c +1 -7
@@ -746,20 +746,14 @@ static int write_pmu_mappings(struct feat_fd *ff,* Do a first pass to count number of pmu to avoid lseek so this * works in pipe mode as well. */ -while ((pmu =perf_pmus__scan (pmu))) { -if (!pmu->name) -continue ; +while ((pmu =perf_pmus__scan (pmu))) pmu_num++; - } ret =do_write (ff, &pmu_num,sizeof (pmu_num));if (ret <0 )return ret;while ((pmu =perf_pmus__scan (pmu))) { -if (!pmu->name) -continue ; - ret =do_write (ff, &pmu->type,sizeof (pmu->type));if (ret <0 )return ret;
tools/perf/util/mem-events.c +8 -8
@@ -37,7 +37,7 @@ struct perf_mem_event * __weak perf_mem_events__ptr(int i)return &perf_mem_events[i]; } -char *__weak perf_mem_events__name (int i,char *pmu_name__maybe_unused ) +const char *__weak perf_mem_events__name (int i,const char *pmu_name__maybe_unused ) {struct perf_mem_event *e =perf_mem_events__ptr (i);
@@ -53,7 +53,7 @@ char * __weak perf_mem_events__name(int i, char *pmu_name __maybe_unused)return mem_loads_name; } -return (char *)e->name; +return e->name; }__weak bool is_mem_loads_aux_event (struct evsel *leader__maybe_unused )
@@ -186,7 +186,6 @@ int perf_mem_events__record_args(const char **rec_argv, int *argv_nr,int i = *argv_nr, k =0 ;struct perf_mem_event *e;struct perf_pmu *pmu; -char *s;for (int j =0 ; j <PERF_MEM_EVENTS__MAX ; j++) { e =perf_mem_events__ptr (j);
@@ -209,15 +208,16 @@ int perf_mem_events__record_args(const char **rec_argv, int *argv_nr, }while ((pmu =perf_pmus__scan (pmu)) !=NULL ) { +const char *s =perf_mem_events__name (j, pmu->name); + rec_argv[i++] ="-e" ; - s =perf_mem_events__name (j, pmu->name);if (s) { - s =strdup (s); -if (!s) +char *copy =strdup (s); +if (!copy)return -1 ; - rec_argv[i++] = s; - rec_tmp[k++] = s; + rec_argv[i++] = copy; + rec_tmp[k++] = copy; } } }
tools/perf/util/mem-events.h +1 -1
@@ -38,7 +38,7 @@ extern unsigned int perf_mem_events__loads_ldlat;int perf_mem_events__parse (const char *str);int perf_mem_events__init (void ); -char *perf_mem_events__name (int i,char *pmu_name); +const char *perf_mem_events__name (int i,const char *pmu_name);struct perf_mem_event *perf_mem_events__ptr (int i);bool is_mem_loads_aux_event (struct evsel *leader);
tools/perf/util/parse-events.c +2 -5
@@ -262,7 +262,7 @@ __add_event(struct list_head *list, int *idx, evsel->core.is_pmu_core = pmu ? pmu->is_core : false; evsel->auto_merge_stats = auto_merge_stats; evsel->pmu = pmu; - evsel->pmu_name = pmu && pmu->name ?strdup (pmu->name) :NULL ; + evsel->pmu_name = pmu ?strdup (pmu->name) :NULL ;if (name) evsel->name =strdup (name);
@@ -437,9 +437,6 @@ bool parse_events__filter_pmu(const struct parse_events_state *parse_state,if (parse_state->pmu_filter ==NULL )return false; -if (pmu->name ==NULL ) -return true; -return strcmp (parse_state->pmu_filter, pmu->name) !=0 ; }
@@ -1292,7 +1289,7 @@ static bool config_term_percore(struct list_head *config_terms) }int parse_events_add_pmu (struct parse_events_state *parse_state, -struct list_head *list,char *name, +struct list_head *list,const char *name,struct list_head *head_config,bool auto_merge_stats,void *loc_) {
tools/perf/util/parse-events.h +1 -1
@@ -176,7 +176,7 @@ int parse_events_add_breakpoint(struct parse_events_state *parse_state, u64 addr, char *type, u64 len, struct list_head *head_config);int parse_events_add_pmu (struct parse_events_state *parse_state, -struct list_head *list,char *name, +struct list_head *list,const char *name,struct list_head *head_config,bool auto_merge_stats,void *loc);
tools/perf/util/parse-events.y +1 -1
@@ -307,7 +307,7 @@ PE_NAME opt_pmu_config } while ((pmu = perf_pmus__scan(pmu)) != NULL) { - char *name = pmu->name; + const char *name = pmu->name; if (parse_events__filter_pmu(parse_state, pmu)) continue;
tools/perf/util/pmu.c +9 -7
@@ -29,7 +29,9 @@#include "fncache.h" #include "util/evsel_config.h" -struct perf_pmu perf_pmu__fake; +struct perf_pmu perf_pmu__fake = { + .name ="fake" , +};#define UNIT_MAX_LEN 31/* max length for event unit name */
@@ -967,13 +969,13 @@ perf_pmu__get_default_config(struct perf_pmu *pmu __maybe_unused)return NULL ; } -char *__weak +const char *__weak pmu_find_real_name (const char *name) { -return (char *)name; +return name; } -char *__weak +const char *__weak pmu_find_alias_name (const char *name__maybe_unused ) {return NULL ;
@@ -991,8 +993,8 @@ struct perf_pmu *perf_pmu__lookup(struct list_head *pmus, int dirfd, const char {struct perf_pmu *pmu;__u32 type; -char *name =pmu_find_real_name (lookup_name); -char *alias_name; +const char *name =pmu_find_real_name (lookup_name); +const char *alias_name; pmu =zalloc (sizeof (*pmu));if (!pmu)
@@ -1974,7 +1976,7 @@ void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config, name ?: "N/A", buf, config_name, config); } -int perf_pmu__match (char *pattern,char *name,char *tok) +int perf_pmu__match (const char *pattern,const char *name,const char *tok) {if (!name)return -1 ;
tools/perf/util/pmu.h +4 -4
@@ -39,7 +39,7 @@ struct perf_pmu_caps {*/ struct perf_pmu {/** @name: The name of the PMU such as "cpu". */ -char *name; +const char *name;/** * @alias_name: Optional alternate name for the PMU determined in * architecture specific code.
@@ -249,10 +249,10 @@ void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config, const char *config_name);void perf_pmu__warn_invalid_formats (struct perf_pmu *pmu); -int perf_pmu__match (char *pattern,char *name,char *tok); +int perf_pmu__match (const char *pattern,const char *name,const char *tok); -char *pmu_find_real_name (const char *name); -char *pmu_find_alias_name (const char *name); +const char *pmu_find_real_name (const char *name); +const char *pmu_find_alias_name (const char *name);double perf_pmu__cpu_slots_per_cycle (void );int perf_pmu__event_source_devices_scnprintf (char *pathname,size_t size); int perf_pmu__pathname_scnprintf(char *buf, size_t size,
Signature · 7 lines
2.42.0.rc2.253.gd59a3bf2b4-goog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Ian Rogers
reviewerPATCH v2 3/6 perf parse-events: Make term's config const
In reply to Ian RogersThis avoids casts in tests. Use zfree in a few places to avoid warnings about a freeing a const pointer.
--- tools/perf/tests/pmu.c | 18 +++++++++--------- tools/perf/util/parse-events.c | 10 +++++----- tools/perf/util/parse-events.h | 4 ++-- tools/perf/util/pmu.c | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-)
tools/perf/tests/pmu.c +9 -9
@@ -28,55 +28,55 @@ static struct test_format {/* Simulated users input. */ static struct parse_events_term test_terms[] = { { - .config = (char *)"krava01" , + .config ="krava01" , .val.num =15 , .type_val =PARSE_EVENTS__TERM_TYPE_NUM , .type_term =PARSE_EVENTS__TERM_TYPE_USER , }, { - .config = (char *)"krava02" , + .config ="krava02" , .val.num =170 , .type_val =PARSE_EVENTS__TERM_TYPE_NUM , .type_term =PARSE_EVENTS__TERM_TYPE_USER , }, { - .config = (char *)"krava03" , + .config ="krava03" , .val.num =1 , .type_val =PARSE_EVENTS__TERM_TYPE_NUM , .type_term =PARSE_EVENTS__TERM_TYPE_USER , }, { - .config = (char *)"krava11" , + .config ="krava11" , .val.num =27 , .type_val =PARSE_EVENTS__TERM_TYPE_NUM , .type_term =PARSE_EVENTS__TERM_TYPE_USER , }, { - .config = (char *)"krava12" , + .config ="krava12" , .val.num =1 , .type_val =PARSE_EVENTS__TERM_TYPE_NUM , .type_term =PARSE_EVENTS__TERM_TYPE_USER , }, { - .config = (char *)"krava13" , + .config ="krava13" , .val.num =2 , .type_val =PARSE_EVENTS__TERM_TYPE_NUM , .type_term =PARSE_EVENTS__TERM_TYPE_USER , }, { - .config = (char *)"krava21" , + .config ="krava21" , .val.num =119 , .type_val =PARSE_EVENTS__TERM_TYPE_NUM , .type_term =PARSE_EVENTS__TERM_TYPE_USER , }, { - .config = (char *)"krava22" , + .config ="krava22" , .val.num =11 , .type_val =PARSE_EVENTS__TERM_TYPE_NUM , .type_term =PARSE_EVENTS__TERM_TYPE_USER , }, { - .config = (char *)"krava23" , + .config ="krava23" , .val.num =2 , .type_val =PARSE_EVENTS__TERM_TYPE_NUM , .type_term =PARSE_EVENTS__TERM_TYPE_USER ,
tools/perf/util/parse-events.c +5 -5
@@ -199,7 +199,7 @@ static void fix_raw(struct list_head *config_terms, struct perf_pmu *pmu)continue ;if (perf_pmu__have_event (pmu, term->val.str)) { -free (term->config); +zfree (&term->config); term->config = term->val.str; term->type_val =PARSE_EVENTS__TERM_TYPE_NUM ; term->type_term =PARSE_EVENTS__TERM_TYPE_USER ;
@@ -208,7 +208,7 @@ static void fix_raw(struct list_head *config_terms, struct perf_pmu *pmu)continue ; } -free (term->config); +zfree (&term->config); term->config =strdup ("config" ); errno =0 ; num =strtoull (term->val.str +1 ,NULL ,16 );
@@ -1416,7 +1416,7 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state,struct perf_pmu *pmu =NULL ;YYLTYPE *loc = loc_;int ok =0 ; -char *config; +const char *config; *listp =NULL ;
@@ -1435,7 +1435,7 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state, PARSE_EVENTS__TERM_TYPE_USER, config, 1, false, NULL, NULL) < 0) { -free (config); +zfree (&config); goto out_err; }list_add_tail (&term->list, head);
@@ -2378,7 +2378,7 @@ static int new_term(struct parse_events_term **_term, }int parse_events_term__num (struct parse_events_term **term, -int type_term,char *config,u64 num, +int type_term,const char *config,u64 num,bool no_value,void *loc_term_,void *loc_val_) {
tools/perf/util/parse-events.h +2 -2
@@ -83,7 +83,7 @@ enum { };struct parse_events_term { -char *config; +const char *config;union {char *str;u64 num;
@@ -138,7 +138,7 @@ bool parse_events__filter_pmu(const struct parse_events_state *parse_state,void parse_events__shrink_config_terms (void );int parse_events__is_hardcoded_term (struct parse_events_term *term);int parse_events_term__num (struct parse_events_term **term, -int type_term,char *config,u64 num, +int type_term,const char *config,u64 num,bool novalue,void *loc_term,void *loc_val); int parse_events_term__str(struct parse_events_term **term,
tools/perf/util/pmu.c +1 -1
@@ -1418,7 +1418,7 @@ static struct perf_pmu_alias *pmu_find_alias(struct perf_pmu *pmu, struct parse_events_term *term) {struct perf_pmu_alias *alias; -char *name; +const char *name;if (parse_events__is_hardcoded_term (term))return NULL ;
Signature · 7 lines
2.42.0.rc2.253.gd59a3bf2b4-goog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Ian Rogers
reviewerPATCH v2 4/6 perf pmu: Make id const and add missing free
In reply to Ian RogersThe struct pmu id is initialized from pmu_id that is read into allocated memory from a file, as such it needs free-ing in pmu__delete. Make the id value const so that we can remove casts in tests.
--- tools/perf/tests/pmu-events.c | 4 ++-- tools/perf/util/pmu.c | 1 + tools/perf/util/pmu.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)
tools/perf/tests/pmu-events.c +2 -2
@@ -684,7 +684,7 @@ static struct perf_pmu_test_pmu test_pmus[] = { .pmu = { .name = "uncore_sys_ddr_pmu0", .is_uncore = 1, - .id = (char *)"v8", + .id = "v8", }, .aliases = { &sys_ddr_pmu_write_cycles,
@@ -694,7 +694,7 @@ static struct perf_pmu_test_pmu test_pmus[] = { .pmu = { .name = "uncore_sys_ccn_pmu4", .is_uncore = 1, - .id = (char *)"0x01", + .id = "0x01", }, .aliases = { &sys_ccn_pmu_read_cycles,
tools/perf/util/pmu.c +1 -0
@@ -2056,6 +2056,7 @@ void perf_pmu__delete(struct perf_pmu *pmu)zfree (&pmu->default_config);zfree (&pmu->name);zfree (&pmu->alias_name); +zfree (&pmu->id);free (pmu); }
tools/perf/util/pmu.h +1 -1
@@ -49,7 +49,7 @@ struct perf_pmu {* @id: Optional PMU identifier read from * <sysfs>/bus/event_source/devices/<name>/identifier. */ -char *id; +const char *id;/** * @type: Perf event attributed type value, read from * <sysfs>/bus/event_source/devices/<name>/type.
Signature · 7 lines
2.42.0.rc2.253.gd59a3bf2b4-goog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Ian Rogers
reviewerPATCH v2 5/6 perf build-id: Simplify build_id_cache__cachedir
In reply to Ian RogersInitialize realname to NULL, rather than name. This avoids a cast and as realpath is either NULL or an allocated string, free can be called unconditionally.
--- tools/perf/util/build-id.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
tools/perf/util/build-id.c +2 -4
@@ -560,7 +560,7 @@ char *build_id_cache__cachedir(const char *sbuild_id, const char *name, struct nsinfo *nsi, bool is_kallsyms, bool is_vdso) { - char *realname = (char *)name, *filename; + char *realname = NULL, *filename;bool slash = is_kallsyms || is_vdso;if (!slash)
@@ -571,9 +571,7 @@ char *build_id_cache__cachedir(const char *sbuild_id, const char *name, sbuild_id ? "/" : "", sbuild_id ?: "") < 0) filename =NULL ; -if (!slash) -free (realname); - +free (realname);return filename; }
Signature · 1 line
2.42.0.rc2.253.gd59a3bf2b4-goog
Ian Rogers
reviewerPATCH v2 6/6 perf tui slang: Tidy casts
In reply to Ian RogersCasts were necessary for older versions of libslang, however, these are now 15 years old and so we no longer need to care about supporting them. Tidy the casts and remove unnecessary logic. Move the ENABLE_SLFUTURE_CONST to the libslang.h common include file, and also enable ENABLE_SLFUTURE_VOID.
--- tools/perf/ui/Build | 2 -- tools/perf/ui/browser.c | 6 +++--- tools/perf/ui/browsers/Build | 5 ----- tools/perf/ui/libslang.h | 20 ++++---------------- tools/perf/ui/tui/helpline.c | 2 +- tools/perf/ui/tui/setup.c | 2 +- tools/perf/ui/tui/util.c | 12 ++++++------ 7 files changed, 15 insertions(+), 34 deletions(-)
tools/perf/ui/Build +0 -2
@@ -10,5 +10,3 @@ CFLAGS_setup.o += -DLIBDIR="BUILD_STR($(LIBDIR))" perf-$(CONFIG_SLANG) += browser.o perf-$(CONFIG_SLANG) += browsers/ perf-$(CONFIG_SLANG) += tui/ - -CFLAGS_browser.o += -DENABLE_SLFUTURE_CONST
tools/perf/ui/browser.c +3 -3
@@ -57,12 +57,12 @@ void ui_browser__gotorc(struct ui_browser *browser, int y, int x)void ui_browser__write_nstring (struct ui_browser *browser__maybe_unused ,const char *msg,unsigned int width) { -slsmg_write_nstring (msg, width); +SLsmg_write_nstring (msg, width); }void ui_browser__vprintf (struct ui_browser *browser__maybe_unused ,const char *fmt,va_list args) { -slsmg_vprintf (fmt, args); +SLsmg_vprintf (fmt, args); }void ui_browser__printf (struct ui_browser *browser__maybe_unused ,const char *fmt, ...)
@@ -808,6 +808,6 @@ void ui_browser__init(void)while (ui_browser__colorsets[i].name) {struct ui_browser_colorset *c = &ui_browser__colorsets[i++]; -sltt_set_color (c->colorset, c->name, c->fg, c->bg); +SLtt_set_color (c->colorset, c->name, c->fg, c->bg); } }
tools/perf/ui/browsers/Build +0 -5
@@ -4,8 +4,3 @@ perf-y += map.o perf-y += scripts.o perf-y += header.o perf-y += res_sample.o - -CFLAGS_annotate.o += -DENABLE_SLFUTURE_CONST -CFLAGS_hists.o += -DENABLE_SLFUTURE_CONST -CFLAGS_map.o += -DENABLE_SLFUTURE_CONST -CFLAGS_scripts.o += -DENABLE_SLFUTURE_CONST
tools/perf/ui/libslang.h +4 -16
@@ -11,28 +11,16 @@#define HAVE_LONG_LONG __GLIBC_HAVE_LONG_LONG#endif +/* Enable future slang's corrected function prototypes. */ +#define ENABLE_SLFUTURE_CONST 1 +#define ENABLE_SLFUTURE_VOID 1 +#ifdef HAVE_SLANG_INCLUDE_SUBDIR #include <slang/slang.h> #else #include <slang.h> #endif -#if SLANG_VERSION <20104 -#define slsmg_printf(msg, args...) \ - SLsmg_printf((char *)(msg), ##args) -#define slsmg_vprintf (msg, vargs) \ - SLsmg_vprintf((char *)(msg), vargs) -#define slsmg_write_nstring (msg, len) \ - SLsmg_write_nstring((char *)(msg), len) -#define sltt_set_color (obj, name, fg, bg) \ - SLtt_set_color(obj,(char *)(name), (char *)(fg), (char *)(bg)) -#else -#define slsmg_printf SLsmg_printf -#define slsmg_vprintf SLsmg_vprintf -#define slsmg_write_nstring SLsmg_write_nstring -#define sltt_set_color SLtt_set_color -#endif -#define SL_KEY_UNTAB 0x1000#endif /* _PERF_UI_SLANG_H_ */
tools/perf/ui/tui/helpline.c +1 -1
@@ -22,7 +22,7 @@ static void tui_helpline__push(const char *msg)SLsmg_gotorc (SLtt_Screen_Rows -1 ,0 );SLsmg_set_color (0 ); -SLsmg_write_nstring ((char *)msg, SLtt_Screen_Cols); +SLsmg_write_nstring (msg, SLtt_Screen_Cols);SLsmg_refresh ();strlcpy (ui_helpline__current, msg, sz); }
tools/perf/ui/tui/setup.c +1 -1
@@ -142,7 +142,7 @@ int ui__init(void) goto out; } -SLkp_define_keysym ((char *)"^(kB)" ,SL_KEY_UNTAB ); +SLkp_define_keysym ("^(kB)" ,SL_KEY_UNTAB );signal (SIGSEGV , ui__signal_backtrace);signal (SIGFPE , ui__signal_backtrace);
tools/perf/ui/tui/util.c +6 -6
@@ -106,7 +106,7 @@ int ui_browser__input_window(const char *title, const char *text, char *input,SLsmg_draw_box (y, x++, nr_lines, max_len);if (title) {SLsmg_gotorc (y, x +1 ); -SLsmg_write_string ((char *)title); +SLsmg_write_string (title); }SLsmg_gotorc (++y, x); nr_lines -=7 ;
@@ -117,12 +117,12 @@ int ui_browser__input_window(const char *title, const char *text, char *input, len =5 ;while (len--) {SLsmg_gotorc (y + len -1 , x); -SLsmg_write_nstring ((char *)" " , max_len); +SLsmg_write_nstring (" " , max_len); }SLsmg_draw_box (y++, x +1 ,3 , max_len -2 );SLsmg_gotorc (y +3 , x); -SLsmg_write_nstring ((char *)exit_msg, max_len); +SLsmg_write_nstring (exit_msg, max_len);SLsmg_refresh ();mutex_unlock (&ui__lock);
@@ -197,7 +197,7 @@ void __ui__info_window(const char *title, const char *text, const char *exit_msgSLsmg_draw_box (y, x++, nr_lines, max_len);if (title) {SLsmg_gotorc (y, x +1 ); -SLsmg_write_string ((char *)title); +SLsmg_write_string (title); }SLsmg_gotorc (++y, x);if (exit_msg)
@@ -207,9 +207,9 @@ void __ui__info_window(const char *title, const char *text, const char *exit_msg nr_lines, max_len, 1);if (exit_msg) {SLsmg_gotorc (y + nr_lines -2 , x); -SLsmg_write_nstring ((char *)" " , max_len); +SLsmg_write_nstring (" " , max_len);SLsmg_gotorc (y + nr_lines -1 , x); -SLsmg_write_nstring ((char *)exit_msg, max_len); +SLsmg_write_nstring (exit_msg, max_len); } }
Signature · 1 line
2.42.0.rc2.253.gd59a3bf2b4-goog