Re: [PATCH tracing/kprobes v2 4/5] perf: Add perf probe subcommandfor kprobe-event setup helper

From: Masami Hiramatsu
Date: Mon Oct 05 2009 - 20:57:41 EST


Steven Rostedt wrote:
> On Fri, 2009-10-02 at 17:49 -0400, Masami Hiramatsu wrote:
>> diff --git a/tools/perf/Makefile b/tools/perf/Makefile
>> index b5f1953..6dabcf1 100644
>> --- a/tools/perf/Makefile
>> +++ b/tools/perf/Makefile
>> @@ -419,6 +419,16 @@ ifneq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf *
>> msg := $(error No libelf.h/libelf found, please install libelf-dev/elfutils-libelf-devel);
>> endif
>>
>> +ifneq ($(shell sh -c "(echo '\#include <libdwarf/dwarf.h>'; echo '\#include <libdwarf/libdwarf.h>'; echo 'int main(void) { Dwarf_Debug dbg; Dwarf_Error err; dwarf_init(0, DW_DLC_READ, 0, 0, &dbg, &err); return (long)dbg; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -ldwarf -lelf -o /dev/null $(ALL_LDFLAGS) > /dev/null 2>&1 && echo y"), y)
>> + msg := $(warning No libdwarf.h found, disables probe subcommand. Please install libdwarf-dev/libdwarf-devel);
>
> Wow! And I thought my macros were ugly ;-)

:-)
Maybe, would I better make a separate c file to check this?
Like "autoconf-checkdwarf.c".

>> +
>> + /* Copy arguments */
>> + pp->nr_args = argc - 2;
>> + if (pp->nr_args > 0) {
>> + pp->args = (char **)malloc(sizeof(char *) * pp->nr_args);
>
> Hmm, you don't check for failed malloc here?

Oops...

>> +static int synthesize_probepoint(struct probe_point *pp)
>> +{
>> + char *buf;
>> + int i, len, ret;
>> + pp->probes[0] = buf = (char *)calloc(MAX_CMDLEN, sizeof(char));
>
> Again no check for failed calloc?

Oops again, I'll check it...


>> diff --git a/tools/perf/builtin.h b/tools/perf/builtin.h
>> index e11d8d2..ad5f0f4 100644
>> --- a/tools/perf/builtin.h
>> +++ b/tools/perf/builtin.h
>
> The rest looks fine (for what I can tell, it is all dwarf magic to
> me ;-)

:-)

Thank you!

--
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division

e-mail: mhiramat@xxxxxxxxxx

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/