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

Commit fac13fd5 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

perf probe: Cleanup struct session in builtin-probe.c 



Clean up struct session in builtin-probe.c, including
change need_dwarf to bool and move listing flag into
struct session as list_events flag.

This also changes parse_perf_probe_event() interface
due to code readability.

Signed-off-by: default avatarMasami Hiramatsu <mhiramat@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Jim Keniston <jkenisto@us.ibm.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Frank Ch. Eigler <fche@redhat.com>
Cc: Jason Baron <jbaron@redhat.com>
Cc: K.Prasad <prasad@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: systemtap <systemtap@sources.redhat.com>
Cc: DLE <dle-develop@lists.sourceforge.net>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20091215153114.17436.77000.stgit@dhcp-100-2-132.bos.redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f13c12c6

tools/perf/builtin-probe.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -59,13 +59,13 @@ const char *default_search_path[NR_SEARCH_PATH] = { 
static struct {

static struct {

	char *vmlinux;

	char *vmlinux;

	char *release;

	char *release;

	int need_dwarf;

	bool need_dwarf;

	bool list_events;

	int nr_probe;

	int nr_probe;

	struct probe_point probes[MAX_PROBES];

	struct probe_point probes[MAX_PROBES];

	struct strlist *dellist;

	struct strlist *dellist;

} session;

} session;





static bool listing;





/* Parse an event definition. Note that any error must die. */

/* Parse an event definition. Note that any error must die. */

static void parse_probe_event(const char *str)

static void parse_probe_event(const char *str)
@@ -77,7 +77,7 @@ static void parse_probe_event(const char *str) 
		die("Too many probes (> %d) are specified.", MAX_PROBES);

		die("Too many probes (> %d) are specified.", MAX_PROBES);





	/* Parse perf-probe event into probe_point */

	/* Parse perf-probe event into probe_point */

	session.need_dwarf = parse_perf_probe_event(str, pp);

	parse_perf_probe_event(str, pp, &session.need_dwarf);





	pr_debug("%d arguments\n", pp->nr_args);

	pr_debug("%d arguments\n", pp->nr_args);

}

}
@@ -166,7 +166,8 @@ static const struct option options[] = { 
	OPT_STRING('k', "vmlinux", &session.vmlinux, "file",

	OPT_STRING('k', "vmlinux", &session.vmlinux, "file",

		"vmlinux/module pathname"),

		"vmlinux/module pathname"),

#endif

#endif

	OPT_BOOLEAN('l', "list", &listing, "list up current probe events"),

	OPT_BOOLEAN('l', "list", &session.list_events,

		    "list up current probe events"),

	OPT_CALLBACK('d', "del", NULL, "[GROUP:]EVENT", "delete a probe event.",

	OPT_CALLBACK('d', "del", NULL, "[GROUP:]EVENT", "delete a probe event.",

		opt_del_probe_event),

		opt_del_probe_event),

	OPT_CALLBACK('a', "add", NULL,

	OPT_CALLBACK('a', "add", NULL,
@@ -207,10 +208,10 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used) 
	if (argc > 0)

	if (argc > 0)

		parse_probe_event_argv(argc, argv);

		parse_probe_event_argv(argc, argv);





	if ((session.nr_probe == 0 && !session.dellist && !listing))

	if ((!session.nr_probe && !session.dellist && !session.list_events))

		usage_with_options(probe_usage, options);

		usage_with_options(probe_usage, options);





	if (listing) {

	if (session.list_events) {

		if (session.nr_probe != 0 || session.dellist) {

		if (session.nr_probe != 0 || session.dellist) {

			pr_warning("  Error: Don't use --list with"

			pr_warning("  Error: Don't use --list with"

				   " --add/--del.\n");

				   " --add/--del.\n");

tools/perf/util/probe-event.c

+7 −5
Original line number Original line Diff line number Diff line
@@ -150,10 +150,13 @@ static void parse_perf_probe_probepoint(char *arg, struct probe_point *pp) 
}

}





/* Parse perf-probe event definition */

/* Parse perf-probe event definition */

int parse_perf_probe_event(const char *str, struct probe_point *pp)

void parse_perf_probe_event(const char *str, struct probe_point *pp,

			    bool *need_dwarf)

{

{

	char **argv;

	char **argv;

	int argc, i, need_dwarf = 0;

	int argc, i;



	*need_dwarf = false;





	argv = argv_split(str, &argc);

	argv = argv_split(str, &argc);

	if (!argv)

	if (!argv)
@@ -164,7 +167,7 @@ int parse_perf_probe_event(const char *str, struct probe_point *pp) 
	/* Parse probe point */

	/* Parse probe point */

	parse_perf_probe_probepoint(argv[0], pp);

	parse_perf_probe_probepoint(argv[0], pp);

	if (pp->file || pp->line)

	if (pp->file || pp->line)

		need_dwarf = 1;

		*need_dwarf = true;





	/* Copy arguments and ensure return probe has no C argument */

	/* Copy arguments and ensure return probe has no C argument */

	pp->nr_args = argc - 1;

	pp->nr_args = argc - 1;
@@ -177,12 +180,11 @@ int parse_perf_probe_event(const char *str, struct probe_point *pp) 
			if (pp->retprobe)

			if (pp->retprobe)

				semantic_error("You can't specify local"

				semantic_error("You can't specify local"

						" variable for kretprobe");

						" variable for kretprobe");

			need_dwarf = 1;

			*need_dwarf = true;

		}

		}

	}

	}





	argv_free(argv);

	argv_free(argv);

	return need_dwarf;

}

}





/* Parse kprobe_events event into struct probe_point */

/* Parse kprobe_events event into struct probe_point */

tools/perf/util/probe-event.h

+3 −1
Original line number Original line Diff line number Diff line 
#ifndef _PROBE_EVENT_H

#ifndef _PROBE_EVENT_H

#define _PROBE_EVENT_H

#define _PROBE_EVENT_H





#include <stdbool.h>

#include "probe-finder.h"

#include "probe-finder.h"

#include "strlist.h"

#include "strlist.h"





extern int parse_perf_probe_event(const char *str, struct probe_point *pp);

extern void parse_perf_probe_event(const char *str, struct probe_point *pp,

				   bool *need_dwarf);

extern int synthesize_perf_probe_event(struct probe_point *pp);

extern int synthesize_perf_probe_event(struct probe_point *pp);

extern void parse_trace_kprobe_event(const char *str, char **group,

extern void parse_trace_kprobe_event(const char *str, char **group,

				     char **event, struct probe_point *pp);

				     char **event, struct probe_point *pp);