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

Commit 367e94c1 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Arnaldo Carvalho de Melo
Browse files

perf probe: Fix handling of arguments names 



Don't make argument names from raw parameters (means the parameters are written
in kprobe-tracer syntax), because the argument syntax may include special
characters.  Just leave it, then kprobe-tracer gives a new name.

Reported-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20100827113859.22882.75598.stgit@ltc236.sdl.hitachi.co.jp>
Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 04ddd04b

tools/perf/util/probe-finder.c

+19 −13
Original line number Diff line number Diff line
@@ -686,6 +686,25 @@ static int find_variable(Dwarf_Die *sp_die, struct probe_finder *pf) 
	char buf[32], *ptr;

	int ret, nscopes;



	if (!is_c_varname(pf->pvar->var)) {

		/* Copy raw parameters */

		pf->tvar->value = strdup(pf->pvar->var);

		if (pf->tvar->value == NULL)

			return -ENOMEM;

		if (pf->pvar->type) {

			pf->tvar->type = strdup(pf->pvar->type);

			if (pf->tvar->type == NULL)

				return -ENOMEM;

		}

		if (pf->pvar->name) {

			pf->tvar->name = strdup(pf->pvar->name);

			if (pf->tvar->name == NULL)

				return -ENOMEM;

		} else

			pf->tvar->name = NULL;

		return 0;

	}



	if (pf->pvar->name)

		pf->tvar->name = strdup(pf->pvar->name);

	else {
@@ -700,19 +719,6 @@ static int find_variable(Dwarf_Die *sp_die, struct probe_finder *pf) 
	if (pf->tvar->name == NULL)

		return -ENOMEM;



	if (!is_c_varname(pf->pvar->var)) {

		/* Copy raw parameters */

		pf->tvar->value = strdup(pf->pvar->var);

		if (pf->tvar->value == NULL)

			return -ENOMEM;

		if (pf->pvar->type) {

			pf->tvar->type = strdup(pf->pvar->type);

			if (pf->tvar->type == NULL)

				return -ENOMEM;

		}

		return 0;

	}



	pr_debug("Searching '%s' variable in context.\n",

		 pf->pvar->var);

	/* Search child die for local variables and parameters. */