From 74705d2de0926779c2a1a9ec178e1d20a8f86fdf Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Fri, 14 Jan 2011 11:25:58 -0500 Subject: [PATCH] --- yaml --- r: 231496 b: refs/heads/master c: c94fbe1d9e1e9b1a1f82eb0b53b1cf53bcf9712b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/trace/events/module.h | 10 ++++++++++ trunk/tools/perf/Documentation/perf-record.txt | 3 --- trunk/tools/perf/builtin-record.c | 8 -------- trunk/tools/perf/builtin-sched.c | 18 +++++++++--------- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/[refs] b/[refs] index 44feb0697a12..fc90d55ed8ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: acac03fa15a8684bb60489ed87b5aae5258c0838 +refs/heads/master: c94fbe1d9e1e9b1a1f82eb0b53b1cf53bcf9712b diff --git a/trunk/include/trace/events/module.h b/trunk/include/trace/events/module.h index c7bb2f0482fe..c6bae36547e5 100644 --- a/trunk/include/trace/events/module.h +++ b/trunk/include/trace/events/module.h @@ -1,5 +1,15 @@ +/* + * Because linux/module.h has tracepoints in the header, and ftrace.h + * eventually includes this file, define_trace.h includes linux/module.h + * But we do not want the module.h to override the TRACE_SYSTEM macro + * variable that define_trace.h is processing, so we only set it + * when module events are being processed, which would happen when + * CREATE_TRACE_POINTS is defined. + */ +#ifdef CREATE_TRACE_POINTS #undef TRACE_SYSTEM #define TRACE_SYSTEM module +#endif #if !defined(_TRACE_MODULE_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_MODULE_H diff --git a/trunk/tools/perf/Documentation/perf-record.txt b/trunk/tools/perf/Documentation/perf-record.txt index e032716c839b..52462ae26455 100644 --- a/trunk/tools/perf/Documentation/perf-record.txt +++ b/trunk/tools/perf/Documentation/perf-record.txt @@ -61,9 +61,6 @@ OPTIONS -r:: --realtime=:: Collect data with this RT SCHED_FIFO priority. --D:: ---no-delay:: - Collect data without buffering. -A:: --append:: Append to the output file to do incremental profiling. diff --git a/trunk/tools/perf/builtin-record.c b/trunk/tools/perf/builtin-record.c index df6064ad9bf2..1210e6484ad5 100644 --- a/trunk/tools/perf/builtin-record.c +++ b/trunk/tools/perf/builtin-record.c @@ -49,7 +49,6 @@ static int pipe_output = 0; static const char *output_name = "perf.data"; static int group = 0; static int realtime_prio = 0; -static bool nodelay = false; static bool raw_samples = false; static bool sample_id_all_avail = true; static bool system_wide = false; @@ -308,11 +307,6 @@ static void create_counter(struct perf_evsel *evsel, int cpu) attr->sample_type |= PERF_SAMPLE_CPU; } - if (nodelay) { - attr->watermark = 0; - attr->wakeup_events = 1; - } - attr->mmap = track; attr->comm = track; attr->inherit = !no_inherit; @@ -849,8 +843,6 @@ const struct option record_options[] = { "record events on existing thread id"), OPT_INTEGER('r', "realtime", &realtime_prio, "collect data with this RT SCHED_FIFO priority"), - OPT_BOOLEAN('D', "no-delay", &nodelay, - "collect data without buffering"), OPT_BOOLEAN('R', "raw-samples", &raw_samples, "collect raw sample records from all opened counters"), OPT_BOOLEAN('a', "all-cpus", &system_wide, diff --git a/trunk/tools/perf/builtin-sched.c b/trunk/tools/perf/builtin-sched.c index 29e7ffd85690..abd4b8497bc4 100644 --- a/trunk/tools/perf/builtin-sched.c +++ b/trunk/tools/perf/builtin-sched.c @@ -1843,15 +1843,15 @@ static const char *record_args[] = { "-f", "-m", "1024", "-c", "1", - "-e", "sched:sched_switch", - "-e", "sched:sched_stat_wait", - "-e", "sched:sched_stat_sleep", - "-e", "sched:sched_stat_iowait", - "-e", "sched:sched_stat_runtime", - "-e", "sched:sched_process_exit", - "-e", "sched:sched_process_fork", - "-e", "sched:sched_wakeup", - "-e", "sched:sched_migrate_task", + "-e", "sched:sched_switch:r", + "-e", "sched:sched_stat_wait:r", + "-e", "sched:sched_stat_sleep:r", + "-e", "sched:sched_stat_iowait:r", + "-e", "sched:sched_stat_runtime:r", + "-e", "sched:sched_process_exit:r", + "-e", "sched:sched_process_fork:r", + "-e", "sched:sched_wakeup:r", + "-e", "sched:sched_migrate_task:r", }; static int __cmd_record(int argc, const char **argv)