Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

perf trace beauty: Export strarray for use in per-object beautifiers 

Like will be done with fcntl(fd, F_GETLEASE, F_RDLCK|F_WRLCK|F_UNLCK)

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-3p11bgirtntjfmbixfkz8i2m@git.kernel.org


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

tools/perf/builtin-trace.c

+7 −20
Original line number Diff line number Diff line
@@ -283,34 +283,21 @@ static struct perf_evsel *perf_evsel__syscall_newtp(const char *direction, void 
	({ struct syscall_tp *fields = evsel->priv; \

	   fields->name.pointer(&fields->name, sample); })



struct strarray {

	int	    offset;

	int	    nr_entries;

	const char **entries;

};

size_t strarray__scnprintf(struct strarray *sa, char *bf, size_t size, const char *intfmt, int val)

{

	int idx = val - sa->offset;



#define DEFINE_STRARRAY(array) struct strarray strarray__##array = { \

	.nr_entries = ARRAY_SIZE(array), \

	.entries = array, \

}

	if (idx < 0 || idx >= sa->nr_entries)

		return scnprintf(bf, size, intfmt, val);



#define DEFINE_STRARRAY_OFFSET(array, off) struct strarray strarray__##array = { \

	.offset	    = off, \

	.nr_entries = ARRAY_SIZE(array), \

	.entries = array, \

	return scnprintf(bf, size, "%s", sa->entries[idx]);

}



static size_t __syscall_arg__scnprintf_strarray(char *bf, size_t size,

						const char *intfmt,

					        struct syscall_arg *arg)

{

	struct strarray *sa = arg->parm;

	int idx = arg->val - sa->offset;



	if (idx < 0 || idx >= sa->nr_entries)

		return scnprintf(bf, size, intfmt, arg->val);



	return scnprintf(bf, size, "%s", sa->entries[idx]);

	return strarray__scnprintf(arg->parm, bf, size, intfmt, arg->val);

}



static size_t syscall_arg__scnprintf_strarray(char *bf, size_t size,

tools/perf/trace/beauty/beauty.h

+20 −0
Original line number Diff line number Diff line 
#ifndef _PERF_TRACE_BEAUTY_H

#define _PERF_TRACE_BEAUTY_H



#include <linux/kernel.h>

#include <linux/types.h>



struct strarray {

	int	    offset;

	int	    nr_entries;

	const char **entries;

};



#define DEFINE_STRARRAY(array) struct strarray strarray__##array = { \

	.nr_entries = ARRAY_SIZE(array), \

	.entries = array, \

}



#define DEFINE_STRARRAY_OFFSET(array, off) struct strarray strarray__##array = { \

	.offset	    = off, \

	.nr_entries = ARRAY_SIZE(array), \

	.entries = array, \

}



size_t strarray__scnprintf(struct strarray *sa, char *bf, size_t size, const char *intfmt, int val);



struct trace;

struct thread;