Merge branch 'trace-cmd' into trace-view

3 files changed, 8 insertions, 26 deletions

diff --git a/.gitignore b/.gitignore
index af130c3..34f5c39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,7 @@ trace.dat
 kernelshark
 trace-graph
 trace-view
+*.pyc
+*.swp
+ctracecmd_wrap.c
 
diff --git a/trace-ftrace.c b/trace-ftrace.c
index 459f74b..1b79ec7 100644
--- a/trace-ftrace.c
+++ b/trace-ftrace.c
@@ -255,10 +255,7 @@ fgraph_ent_handler(struct trace_seq *s, struct record *record,
                 /*
                  * The record returned needs to be freed.
                  * We also do a new peek on this CPU to update the
-                 * record cache. (peek caches the record, but the
-                 * refresh below will update the CPU iterator.
-                 * If peek has a record in cache, it will update the
-                 * iterator to that)
+                 * record cache.
                  */
                 ret = print_graph_entry_leaf(s, event, data, rec);
                 free_record(rec);
@@ -268,19 +265,6 @@ fgraph_ent_handler(struct trace_seq *s, struct record *record,
 
         free(data);
 
-        /*
-         * The above peek may unmap the record given to us.
-         * But callers may still have a reference to that record.
-         * We need to make sure it is still mapped.
-         *
-         * Note, this causes a known bug. If the last item in the trace
-         * was a leaf function, we can't remove it. The peek cache
-         * above will be NULL (no records after the leaf) so a new peek
-         * will simply read the return entry of the leaf and print it
-         * again.
-         */
-        tracecmd_refresh_record(tracecmd_curr_thread_handle,
-                                record);
         return ret;
 }
 
diff --git a/trace-input.c b/trace-input.c
index 431c580..9096521 100644
--- a/trace-input.c
+++ b/trace-input.c
@@ -917,6 +917,8 @@ tracecmd_read_at(struct tracecmd_input *handle, unsigned long long offset,
  * by reading new records the mmap section may be unmapped.
  * This will refresh the record's data mapping.
  *
+ * ===== OBSOLETED BY PAGE REFERENCES =====
+ *
  * Returns 1 if page is still mapped (does not modify CPU iterator)
  *         0 on successful mapping (was not mapped before,
  *                      This will update CPU iterator to point to
@@ -1215,7 +1217,6 @@ tracecmd_peek_data(struct tracecmd_input *handle, int cpu)
         unsigned long long extend;
         unsigned int type_len;
         int length;
-        int ret;
 
         /* Hack to work around function graph read ahead */
         tracecmd_curr_thread_handle = handle;
@@ -1223,17 +1224,11 @@ tracecmd_peek_data(struct tracecmd_input *handle, int cpu)
         if (handle->cpu_data[cpu].next) {
                 /* Make sure it's still mapped */
                 record = handle->cpu_data[cpu].next;
-                ret = tracecmd_refresh_record(handle, record);
-                if (ret < 0) {
-                        free_record(record);
-                        handle->cpu_data[cpu].next = NULL;
-                        return NULL;
-                }
                 /*
                  * Make sure the index and timestamp are where
-                 * we want them, because the refresh did not update it.
+                 * we want them.
                  */
-                if (ret && handle->cpu_data[cpu].timestamp != record->ts) {
+                if (handle->cpu_data[cpu].timestamp != record->ts) {
                         handle->cpu_data[cpu].index =
                                 (record->offset & (handle->page_size - 1)) +
                                 record->record_size;