diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 11:19:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 11:19:03 -0400 |
commit | 4d7b4ac22fbec1a03206c6cde353f2fd6942f828 (patch) | |
tree | 2d96a9e9c28cf6fa628a278decc00ad55a8b043b /tools/perf/util/scripting-engines | |
parent | 3aaf51ace5975050ab43c7d4d7e439e0ae7d13d7 (diff) | |
parent | 94f3ca95787ada3d64339a4ecb2754236ab563f6 (diff) |
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (311 commits)
perf tools: Add mode to build without newt support
perf symbols: symbol inconsistency message should be done only at verbose=1
perf tui: Add explicit -lslang option
perf options: Type check all the remaining OPT_ variants
perf options: Type check OPT_BOOLEAN and fix the offenders
perf options: Check v type in OPT_U?INTEGER
perf options: Introduce OPT_UINTEGER
perf tui: Add workaround for slang < 2.1.4
perf record: Fix bug mismatch with -c option definition
perf options: Introduce OPT_U64
perf tui: Add help window to show key associations
perf tui: Make <- exit menus too
perf newt: Add single key shortcuts for zoom into DSO and threads
perf newt: Exit browser unconditionally when CTRL+C, q or Q is pressed
perf newt: Fix the 'A'/'a' shortcut for annotate
perf newt: Make <- exit the ui_browser
x86, perf: P4 PMU - fix counters management logic
perf newt: Make <- zoom out filters
perf report: Report number of events, not samples
perf hist: Clarify events_stats fields usage
...
Fix up trivial conflicts in kernel/fork.c and tools/perf/builtin-record.c
Diffstat (limited to 'tools/perf/util/scripting-engines')
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-perl.c | 3 | ||||
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c index 5376378e0cfc..b059dc50cc2d 100644 --- a/tools/perf/util/scripting-engines/trace-event-perl.c +++ b/tools/perf/util/scripting-engines/trace-event-perl.c | |||
@@ -371,7 +371,6 @@ static int perl_start_script(const char *script, int argc, const char **argv) | |||
371 | run_start_sub(); | 371 | run_start_sub(); |
372 | 372 | ||
373 | free(command_line); | 373 | free(command_line); |
374 | fprintf(stderr, "perf trace started with Perl script %s\n\n", script); | ||
375 | return 0; | 374 | return 0; |
376 | error: | 375 | error: |
377 | perl_free(my_perl); | 376 | perl_free(my_perl); |
@@ -394,8 +393,6 @@ static int perl_stop_script(void) | |||
394 | perl_destruct(my_perl); | 393 | perl_destruct(my_perl); |
395 | perl_free(my_perl); | 394 | perl_free(my_perl); |
396 | 395 | ||
397 | fprintf(stderr, "\nperf trace Perl script stopped\n"); | ||
398 | |||
399 | return 0; | 396 | return 0; |
400 | } | 397 | } |
401 | 398 | ||
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 6a72f14c5986..81f39cab3aaa 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c | |||
@@ -374,8 +374,6 @@ static int python_start_script(const char *script, int argc, const char **argv) | |||
374 | } | 374 | } |
375 | 375 | ||
376 | free(command_line); | 376 | free(command_line); |
377 | fprintf(stderr, "perf trace started with Python script %s\n\n", | ||
378 | script); | ||
379 | 377 | ||
380 | return err; | 378 | return err; |
381 | error: | 379 | error: |
@@ -407,8 +405,6 @@ out: | |||
407 | Py_XDECREF(main_module); | 405 | Py_XDECREF(main_module); |
408 | Py_Finalize(); | 406 | Py_Finalize(); |
409 | 407 | ||
410 | fprintf(stderr, "\nperf trace Python script stopped\n"); | ||
411 | |||
412 | return err; | 408 | return err; |
413 | } | 409 | } |
414 | 410 | ||