1 files changed, 25 insertions, 14 deletions

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 64a186edc7be..88dfef70c13d 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -14,7 +14,6 @@
 #include "util.h"
 #include "cpumap.h"
 #include "perf_regs.h"
-#include "vdso.h"
 
 static int perf_session__open(struct perf_session *session)
 {
@@ -156,7 +155,6 @@ void perf_session__delete(struct perf_session *session)
         if (session->file)
                 perf_data_file__close(session->file);
         free(session);
-        vdso__exit();
 }
 
 static int process_event_synth_tracing_data_stub(struct perf_tool *tool
@@ -511,6 +509,7 @@ static int flush_sample_queue(struct perf_session *s,
                 os->last_flush = iter->timestamp;
                 list_del(&iter->list);
                 list_add(&iter->list, &os->sample_cache);
+                os->nr_samples--;
 
                 if (show_progress)
                         ui_progress__update(&prog, 1);
@@ -523,8 +522,6 @@ static int flush_sample_queue(struct perf_session *s,
                         list_entry(head->prev, struct sample_queue, list);
         }
 
-        os->nr_samples = 0;
-
         return 0;
 }
 
@@ -994,8 +991,10 @@ static int perf_session_deliver_event(struct perf_session *session,
         }
 }
 
-static int perf_session__process_user_event(struct perf_session *session, union perf_event *event,
-                                            struct perf_tool *tool, u64 file_offset)
+static s64 perf_session__process_user_event(struct perf_session *session,
+                                            union perf_event *event,
+                                            struct perf_tool *tool,
+                                            u64 file_offset)
 {
         int fd = perf_data_file__fd(session->file);
         int err;
@@ -1037,7 +1036,7 @@ static void event_swap(union perf_event *event, bool sample_id_all)
                 swap(event, sample_id_all);
 }
 
-static int perf_session__process_event(struct perf_session *session,
+static s64 perf_session__process_event(struct perf_session *session,
                                        union perf_event *event,
                                        struct perf_tool *tool,
                                        u64 file_offset)
@@ -1083,13 +1082,14 @@ void perf_event_header__bswap(struct perf_event_header *hdr)
 
 struct thread *perf_session__findnew(struct perf_session *session, pid_t pid)
 {
-        return machine__findnew_thread(&session->machines.host, 0, pid);
+        return machine__findnew_thread(&session->machines.host, -1, pid);
 }
 
 static struct thread *perf_session__register_idle_thread(struct perf_session *session)
 {
-        struct thread *thread = perf_session__findnew(session, 0);
+        struct thread *thread;
 
+        thread = machine__findnew_thread(&session->machines.host, 0, 0);
         if (thread == NULL || thread__set_comm(thread, "swapper", 0)) {
                 pr_err("problem inserting idle task.\n");
                 thread = NULL;
@@ -1147,7 +1147,7 @@ static int __perf_session__process_pipe_events(struct perf_session *session,
         union perf_event *event;
         uint32_t size, cur_size = 0;
         void *buf = NULL;
-        int skip = 0;
+        s64 skip = 0;
         u64 head;
         ssize_t err;
         void *p;
@@ -1276,13 +1276,13 @@ int __perf_session__process_events(struct perf_session *session,
                                    u64 file_size, struct perf_tool *tool)
 {
         int fd = perf_data_file__fd(session->file);
-        u64 head, page_offset, file_offset, file_pos;
+        u64 head, page_offset, file_offset, file_pos, size;
         int err, mmap_prot, mmap_flags, map_idx = 0;
         size_t  mmap_size;
         char *buf, *mmaps[NUM_MMAPS];
         union perf_event *event;
-        uint32_t size;
         struct ui_progress prog;
+        s64 skip;
 
         perf_tool__fill_defaults(tool);
 
@@ -1296,8 +1296,10 @@ int __perf_session__process_events(struct perf_session *session,
         ui_progress__init(&prog, file_size, "Processing events...");
 
         mmap_size = MMAP_SIZE;
-        if (mmap_size > file_size)
+        if (mmap_size > file_size) {
                 mmap_size = file_size;
+                session->one_mmap = true;
+        }
 
         memset(mmaps, 0, sizeof(mmaps));
 
@@ -1319,6 +1321,10 @@ remap:
         mmaps[map_idx] = buf;
         map_idx = (map_idx + 1) & (ARRAY_SIZE(mmaps) - 1);
         file_pos = file_offset + head;
+        if (session->one_mmap) {
+                session->one_mmap_addr = buf;
+                session->one_mmap_offset = file_offset;
+        }
 
 more:
         event = fetch_mmaped_event(session, head, mmap_size, buf);
@@ -1337,7 +1343,8 @@ more:
         size = event->header.size;
 
         if (size < sizeof(struct perf_event_header) ||
-            perf_session__process_event(session, event, tool, file_pos) < 0) {
+            (skip = perf_session__process_event(session, event, tool, file_pos))
+                                                                        < 0) {
                 pr_err("%#" PRIx64 " [%#x]: failed to process type: %d\n",
                        file_offset + head, event->header.size,
                        event->header.type);
@@ -1345,6 +1352,9 @@ more:
                 goto out_err;
         }
 
+        if (skip)
+                size += skip;
+
         head += size;
         file_pos += size;
 
@@ -1364,6 +1374,7 @@ out_err:
         ui_progress__finish();
         perf_session__warn_about_errors(session, tool);
         perf_session_free_sample_buffers(session);
+        session->one_mmap = false;
         return err;
 }