perf srcline: Optimize comparision against SRCLINE_UNKNOWN
This is a string constant that gets returned and then strcmp() around, we can instead just do a pointer comparision. That requires a new global variable to comply with these warnings from some versions of clang and gcc: 41 68.95 fedora:rawhide : FAIL clang version 16.0.4 (Fedora 16.0.4-1.fc39) result of comparison against a string literal is unspecified (use an explicit string comparison function instead) [-Werror,-Wstring-compare] if (start_line != SRCLINE_UNKNOWN && ^ ~~~~~~~~~~~~~~~ 41 Ack comments: Agreed, the strcmps make me nervous as they won't distinguish heap from a global meaning we could end up with things like pointers to freed memory. The comparison with the global is always going to be same imo. Acked-by: Ian Rogers <irogers@google.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Ali Saidi <alisaidi@amazon.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Cc: Brian Robbins <brianrob@linux.microsoft.com> Cc: Changbin Du <changbin.du@huawei.com> Cc: Dmitrii Dolgov <9erthalion6@gmail.com> Cc: Fangrui Song <maskray@google.com> Cc: German Gomez <german.gomez@arm.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Ivan Babrou <ivan@cloudflare.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: K Prateek Nayak <kprateek.nayak@amd.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Liam Howlett <liam.howlett@oracle.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Miguel Ojeda <ojeda@kernel.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@amd.com> Cc: Sean Christopherson <seanjc@google.com> Cc: Steinar H. Gunderson <sesse@google.com> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: Wenyu Liu <liuwenyu7@huawei.com> Cc: Will Deacon <will@kernel.org> Cc: Yang Jihong <yangjihong1@huawei.com> Cc: Ye Xingchen <ye.xingchen@zte.com.cn> Cc: Yuan Can <yuancan@huawei.com> Link: https://lore.kernel.org/lkml/ZIcoJytUEz4UgQYR@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Родитель
834631ee77
Коммит
922db21d7e
|
@ -1378,8 +1378,8 @@ static int cycles_printf(struct hist_entry *he, struct hist_entry *pair,
|
|||
end_line = map__srcline(he->ms.map, bi->sym->start + bi->end,
|
||||
he->ms.sym);
|
||||
|
||||
if ((strncmp(start_line, SRCLINE_UNKNOWN, strlen(SRCLINE_UNKNOWN)) != 0) &&
|
||||
(strncmp(end_line, SRCLINE_UNKNOWN, strlen(SRCLINE_UNKNOWN)) != 0)) {
|
||||
if (start_line != SRCLINE_UNKNOWN &&
|
||||
end_line != SRCLINE_UNKNOWN) {
|
||||
scnprintf(buf, sizeof(buf), "[%s -> %s] %4ld",
|
||||
start_line, end_line, block_he->diff.cycles);
|
||||
} else {
|
||||
|
|
|
@ -296,8 +296,8 @@ static int block_range_entry(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
|
|||
end_line = map__srcline(he->ms.map, bi->sym->start + bi->end,
|
||||
he->ms.sym);
|
||||
|
||||
if ((strncmp(start_line, SRCLINE_UNKNOWN, strlen(SRCLINE_UNKNOWN)) != 0) &&
|
||||
(strncmp(end_line, SRCLINE_UNKNOWN, strlen(SRCLINE_UNKNOWN)) != 0)) {
|
||||
if (start_line != SRCLINE_UNKNOWN &&
|
||||
end_line != SRCLINE_UNKNOWN) {
|
||||
scnprintf(buf, sizeof(buf), "[%s -> %s]",
|
||||
start_line, end_line);
|
||||
} else {
|
||||
|
|
|
@ -484,7 +484,7 @@ static int hist_entry__init(struct hist_entry *he,
|
|||
goto err_infos;
|
||||
}
|
||||
|
||||
if (he->srcline && strcmp(he->srcline, SRCLINE_UNKNOWN)) {
|
||||
if (he->srcline && he->srcline != SRCLINE_UNKNOWN) {
|
||||
he->srcline = strdup(he->srcline);
|
||||
if (he->srcline == NULL)
|
||||
goto err_rawdata;
|
||||
|
|
|
@ -496,7 +496,7 @@ int map__fprintf_srcline(struct map *map, u64 addr, const char *prefix,
|
|||
|
||||
if (dso) {
|
||||
char *srcline = map__srcline(map, addr, NULL);
|
||||
if (strncmp(srcline, SRCLINE_UNKNOWN, strlen(SRCLINE_UNKNOWN)) != 0)
|
||||
if (srcline != SRCLINE_UNKNOWN)
|
||||
ret = fprintf(fp, "%s%s", prefix, srcline);
|
||||
zfree_srcline(&srcline);
|
||||
}
|
||||
|
|
|
@ -643,7 +643,7 @@ static char *hist_entry__get_srcfile(struct hist_entry *e)
|
|||
|
||||
sf = __get_srcline(map__dso(map), map__rip_2objdump(map, e->ip),
|
||||
e->ms.sym, false, true, true, e->ip);
|
||||
if (!strcmp(sf, SRCLINE_UNKNOWN))
|
||||
if (sf == SRCLINE_UNKNOWN)
|
||||
return no_srcfile;
|
||||
p = strchr(sf, ':');
|
||||
if (p && *sf) {
|
||||
|
|
|
@ -23,6 +23,8 @@
|
|||
|
||||
bool srcline_full_filename;
|
||||
|
||||
char *srcline__unknown = (char *)"??:0";
|
||||
|
||||
static const char *dso__name(struct dso *dso)
|
||||
{
|
||||
const char *dso_name;
|
||||
|
@ -809,7 +811,7 @@ void zfree_srcline(char **srcline)
|
|||
if (*srcline == NULL)
|
||||
return;
|
||||
|
||||
if (strcmp(*srcline, SRCLINE_UNKNOWN))
|
||||
if (*srcline != SRCLINE_UNKNOWN)
|
||||
free(*srcline);
|
||||
|
||||
*srcline = NULL;
|
||||
|
|
|
@ -25,7 +25,8 @@ char *srcline__tree_find(struct rb_root_cached *tree, u64 addr);
|
|||
/* delete all srclines within the tree */
|
||||
void srcline__tree_delete(struct rb_root_cached *tree);
|
||||
|
||||
#define SRCLINE_UNKNOWN ((char *) "??:0")
|
||||
extern char *srcline__unknown;
|
||||
#define SRCLINE_UNKNOWN srcline__unknown
|
||||
|
||||
struct inline_list {
|
||||
struct symbol *symbol;
|
||||
|
|
Загрузка…
Ссылка в новой задаче