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

Commit af9100ad authored by Ravi Bangoria's avatar Ravi Bangoria Committed by Arnaldo Carvalho de Melo
Browse files

perf probe: Introduce util func is_sdt_event() 



Factor out the SDT event name checking routine as is_sdt_event().

Signed-off-by: default avatarRavi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Taeung Song <treeze.taeung@gmail.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20170314150658.7065-2-ravi.bangoria@linux.vnet.ibm.com


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

tools/perf/util/parse-events.h

+20 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <stdbool.h>

#include <linux/types.h>

#include <linux/perf_event.h>

#include <string.h>



struct list_head;

struct perf_evsel;
@@ -196,4 +197,23 @@ int is_valid_tracepoint(const char *event_string); 
int valid_event_mount(const char *eventfs);

char *parse_events_formats_error_string(char *additional_terms);



#ifdef HAVE_LIBELF_SUPPORT

/*

 * If the probe point starts with '%',

 * or starts with "sdt_" and has a ':' but no '=',

 * then it should be a SDT/cached probe point.

 */

static inline bool is_sdt_event(char *str)

{

	return (str[0] == '%' ||

		(!strncmp(str, "sdt_", 4) &&

		 !!strchr(str, ':') && !strchr(str, '=')));

}

#else

static inline bool is_sdt_event(char *str __maybe_unused)

{

	return false;

}

#endif /* HAVE_LIBELF_SUPPORT */



#endif /* __PERF_PARSE_EVENTS_H */

tools/perf/util/probe-event.c

+1 −8
Original line number Diff line number Diff line
@@ -1341,14 +1341,7 @@ static int parse_perf_probe_point(char *arg, struct perf_probe_event *pev) 
	if (!arg)

		return -EINVAL;



	/*

	 * If the probe point starts with '%',

	 * or starts with "sdt_" and has a ':' but no '=',

	 * then it should be a SDT/cached probe point.

	 */

	if (arg[0] == '%' ||

	    (!strncmp(arg, "sdt_", 4) &&

	     !!strchr(arg, ':') && !strchr(arg, '='))) {

	if (is_sdt_event(arg)) {

		pev->sdt = true;

		if (arg[0] == '%')

			arg++;