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: (162 commits)
  tracing/kprobes: unregister_trace_probe needs to be called under mutex
  perf: expose event__process function
  perf events: Fix mmap offset determination
  perf, powerpc: fsl_emb: Restore setting perf_sample_data.period
  perf, powerpc: Convert the FSL driver to use local64_t
  perf tools: Don't keep unreferenced maps when unmaps are detected
  perf session: Invalidate last_match when removing threads from rb_tree
  perf session: Free the ref_reloc_sym memory at the right place
  x86,mmiotrace: Add support for tracing STOS instruction
  perf, sched migration: Librarize task states and event headers helpers
  perf, sched migration: Librarize the GUI class
  perf, sched migration: Make the GUI class client agnostic
  perf, sched migration: Make it vertically scrollable
  perf, sched migration: Parameterize cpu height and spacing
  perf, sched migration: Fix key bindings
  perf, sched migration: Ignore unhandled task states
  perf, sched migration: Handle ignored migrate out events
  perf: New migration tool overview
  tracing: Drop cpparg() macro
  perf: Use tracepoint_synchronize_unregister() to flush any pending tracepoint call
  ...

Fix up trivial conflicts in Makefile and drivers/cpufreq/cpufreq.c

1 files changed, 27 insertions, 5 deletions

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index dddf3f01b5ab..294da725a57d 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -11,8 +11,9 @@
 
 static char const               *script_name;
 static char const               *generate_script_lang;
-static bool                     debug_ordering;
+static bool                     debug_mode;
 static u64                      last_timestamp;
+static u64                      nr_unordered;
 
 static int default_start_script(const char *script __unused,
                                 int argc __unused,
@@ -91,13 +92,15 @@ static int process_sample_event(event_t *event, struct perf_session *session)
         }
 
         if (session->sample_type & PERF_SAMPLE_RAW) {
-                if (debug_ordering) {
+                if (debug_mode) {
                         if (data.time < last_timestamp) {
                                 pr_err("Samples misordered, previous: %llu "
                                         "this: %llu\n", last_timestamp,
                                         data.time);
+                                nr_unordered++;
                         }
                         last_timestamp = data.time;
+                        return 0;
                 }
                 /*
                  * FIXME: better resolve from pid from the struct trace_entry
@@ -113,6 +116,15 @@ static int process_sample_event(event_t *event, struct perf_session *session)
         return 0;
 }
 
+static u64 nr_lost;
+
+static int process_lost_event(event_t *event, struct perf_session *session __used)
+{
+        nr_lost += event->lost.lost;
+
+        return 0;
+}
+
 static struct perf_event_ops event_ops = {
         .sample = process_sample_event,
         .comm   = event__process_comm,
@@ -120,6 +132,7 @@ static struct perf_event_ops event_ops = {
         .event_type = event__process_event_type,
         .tracing_data = event__process_tracing_data,
         .build_id = event__process_build_id,
+        .lost = process_lost_event,
         .ordered_samples = true,
 };
 
@@ -132,9 +145,18 @@ static void sig_handler(int sig __unused)
 
 static int __cmd_trace(struct perf_session *session)
 {
+        int ret;
+
         signal(SIGINT, sig_handler);
 
-        return perf_session__process_events(session, &event_ops);
+        ret = perf_session__process_events(session, &event_ops);
+
+        if (debug_mode) {
+                pr_err("Misordered timestamps: %llu\n", nr_unordered);
+                pr_err("Lost events: %llu\n", nr_lost);
+        }
+
+        return ret;
 }
 
 struct script_spec {
@@ -544,8 +566,8 @@ static const struct option options[] = {
                    "generate perf-trace.xx script in specified language"),
         OPT_STRING('i', "input", &input_name, "file",
                     "input file name"),
-        OPT_BOOLEAN('d', "debug-ordering", &debug_ordering,
-                   "check that samples time ordering is monotonic"),
+        OPT_BOOLEAN('d', "debug-mode", &debug_mode,
+                   "do various checks like samples ordering and lost events"),
 
         OPT_END()
 };