Commit aa8cc2f6 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Replace STR() calls with __stringify() 

Both do the same thing, the later is the one we get from
linux/stringify.h, i.e. we now use the same function name/practice as
the kernel sources.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-w2sxa5o4bfx7fjrd5mu4zmke@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c3dca1a1

tools/perf/arch/arm/util/dwarf-regs.c

+2 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include <stddef.h>

#include <linux/stringify.h>

#include <dwarf-regs.h>



struct pt_regs_dwarfnum {
@@ -16,10 +17,9 @@ struct pt_regs_dwarfnum { 
	unsigned int dwarfnum;

};



#define STR(s) #s

#define REG_DWARFNUM_NAME(r, num) {.name = r, .dwarfnum = num}

#define GPR_DWARFNUM_NAME(num) \

	{.name = STR(%r##num), .dwarfnum = num}

	{.name = __stringify(%r##num), .dwarfnum = num}

#define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0}



/*

tools/perf/arch/arm64/util/dwarf-regs.c

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <stddef.h>

#include <dwarf-regs.h>

#include <linux/ptrace.h> /* for struct user_pt_regs */

#include <linux/stringify.h>

#include "util.h"



struct pt_regs_dwarfnum {
@@ -20,7 +21,7 @@ struct pt_regs_dwarfnum { 


#define REG_DWARFNUM_NAME(r, num) {.name = r, .dwarfnum = num}

#define GPR_DWARFNUM_NAME(num) \

	{.name = STR(%x##num), .dwarfnum = num}

	{.name = __stringify(%x##num), .dwarfnum = num}

#define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0}

#define DWARFNUM2OFFSET(index) \

	(index * sizeof((struct user_pt_regs *)0)->regs[0])

tools/perf/arch/powerpc/util/dwarf-regs.c

+3 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <dwarf-regs.h>

#include <linux/ptrace.h>

#include <linux/kernel.h>

#include <linux/stringify.h>

#include "util.h"



struct pt_regs_dwarfnum {
@@ -24,10 +25,10 @@ struct pt_regs_dwarfnum { 
};



#define REG_DWARFNUM_NAME(r, num)					\

		{.name = STR(%)STR(r), .dwarfnum = num,			\

		{.name = __stringify(%)__stringify(r), .dwarfnum = num,			\

		.ptregs_offset = offsetof(struct pt_regs, r)}

#define GPR_DWARFNUM_NAME(num)						\

		{.name = STR(%gpr##num), .dwarfnum = num,		\

		{.name = __stringify(%gpr##num), .dwarfnum = num,		\

		.ptregs_offset = offsetof(struct pt_regs, gpr[num])}

#define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0, .ptregs_offset = 0}

tools/perf/util/cgroup.c

+3 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "evsel.h"

#include "cgroup.h"

#include "evlist.h"

#include <linux/stringify.h>



int nr_cgroups;
@@ -27,8 +28,8 @@ cgroupfs_find_mountpoint(char *buf, size_t maxlen) 
	path_v1[0] = '\0';

	path_v2[0] = '\0';



	while (fscanf(fp, "%*s %"STR(PATH_MAX)"s %"STR(PATH_MAX)"s %"

				STR(PATH_MAX)"s %*d %*d\n",

	while (fscanf(fp, "%*s %"__stringify(PATH_MAX)"s %"__stringify(PATH_MAX)"s %"

				__stringify(PATH_MAX)"s %*d %*d\n",

				mountpoint, type, tokens) == 3) {



		if (!path_v1[0] && !strcmp(type, "cgroup")) {

tools/perf/util/jitdump.c

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <byteswap.h>

#include <sys/stat.h>

#include <sys/mman.h>

#include <linux/stringify.h>



#include "util.h"

#include "event.h"
@@ -181,7 +182,7 @@ jit_open(struct jit_buf_desc *jd, const char *name) 
			jd->use_arch_timestamp);



	if (header.version > JITHEADER_VERSION) {

		pr_err("wrong jitdump version %u, expected " STR(JITHEADER_VERSION),

		pr_err("wrong jitdump version %u, expected " __stringify(JITHEADER_VERSION),

			header.version);

		goto error;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE