[tip:perf/core] perf probe: Correct error message for non-structure type
in [Kernel]
|
Prev: [tip:x86/urgent] x86: Increase CONFIG_NODES_SHIFT max to 10
Next: [tip:perf/core] perf: Fix 'perf sched record' deadlock
From: tip-bot for Masami Hiramatsu on 2 Apr 2010 15:10 Commit-ID: 12e5a7ae475ccb2733d740ffb95d9ca0a18392da Gitweb: http://git.kernel.org/tip/12e5a7ae475ccb2733d740ffb95d9ca0a18392da Author: Masami Hiramatsu <mhiramat(a)redhat.com> AuthorDate: Fri, 2 Apr 2010 12:50:53 -0400 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Fri, 2 Apr 2010 19:35:43 +0200 perf probe: Correct error message for non-structure type perf probe outputs incorrect error message when it is called with non-existent field on a non-data structure local variable. <Before> # perf probe vfs_read 'count.hoge' Fatal: Structure on a register is not supported yet. # perf probe vfs_read 'count->hoge' Fatal: Semantic error: hoge must be referred by '.' This corrects the messsage. <After> # perf probe vfs_read 'count.hoge' Fatal: count is not a data structure. # perf probe vfs_read 'count->hoge' Fatal: count is not a data structure. Signed-off-by: Masami Hiramatsu <mhiramat(a)redhat.com> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Arnaldo Carvalho de Melo <acme(a)redhat.com> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Mike Galbraith <efault(a)gmx.de> Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: systemtap <systemtap(a)sources.redhat.com> Cc: DLE <dle-develop(a)lists.sourceforge.net> LKML-Reference: <20100402165052.23551.75866.stgit(a)localhost6.localdomain6> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- tools/perf/util/probe-finder.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index b44132e..59b0115 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c @@ -429,12 +429,20 @@ static void convert_variable_fields(Dwarf_Die *vr_die, const char *varname, if (die_get_real_type(&type, &type) == NULL) die("Failed to get a type information of %s.", varname); + /* Verify it is a data structure */ + if (dwarf_tag(&type) != DW_TAG_structure_type) + die("%s is not a data structure.", varname); + ref = xzalloc(sizeof(struct kprobe_trace_arg_ref)); if (*ref_ptr) (*ref_ptr)->next = ref; else *ref_ptr = ref; } else { + /* Verify it is a data structure */ + if (dwarf_tag(&type) != DW_TAG_structure_type) + die("%s is not a data structure.", varname); + if (field->ref) die("Semantic error: %s must be referred by '.'", field->name); @@ -442,10 +450,6 @@ static void convert_variable_fields(Dwarf_Die *vr_die, const char *varname, die("Structure on a register is not supported yet."); } - /* Verify it is a data structure */ - if (dwarf_tag(&type) != DW_TAG_structure_type) - die("%s is not a data structure.", varname); - if (die_find_member(&type, field->name, &member) == NULL) die("%s(tyep:%s) has no member %s.", varname, dwarf_diename(&type), field->name); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |