1 files changed, 15 insertions, 3 deletions

diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c
index 6fb781d5586c..85d4919dd623 100644
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -275,8 +275,19 @@ static int process_event(struct machine *machine, struct perf_evlist *evlist,
         if (event->header.type == PERF_RECORD_SAMPLE)
                 return process_sample_event(machine, evlist, event, state);
 
-        if (event->header.type < PERF_RECORD_MAX)
-                return machine__process_event(machine, event);
+        if (event->header.type == PERF_RECORD_THROTTLE ||
+            event->header.type == PERF_RECORD_UNTHROTTLE)
+                return 0;
+
+        if (event->header.type < PERF_RECORD_MAX) {
+                int ret;
+
+                ret = machine__process_event(machine, event, NULL);
+                if (ret < 0)
+                        pr_debug("machine__process_event failed, event type %u\n",
+                                 event->header.type);
+                return ret;
+        }
 
         return 0;
 }
@@ -290,6 +301,7 @@ static int process_events(struct machine *machine, struct perf_evlist *evlist,
         for (i = 0; i < evlist->nr_mmaps; i++) {
                 while ((event = perf_evlist__mmap_read(evlist, i)) != NULL) {
                         ret = process_event(machine, evlist, event, state);
+                        perf_evlist__mmap_consume(evlist, i);
                         if (ret < 0)
                                 return ret;
                 }
@@ -440,7 +452,7 @@ static int do_test_code_reading(bool try_kcore)
         }
 
         ret = perf_event__synthesize_thread_map(NULL, threads,
-                                                perf_event__process, machine);
+                                                perf_event__process, machine, false);
         if (ret < 0) {
                 pr_debug("perf_event__synthesize_thread_map failed\n");
                 goto out_err;