6 files changed, 17 insertions, 25 deletions

diff --git a/Makefile b/Makefile
index 1f9e2e5..de4fdc4 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,8 @@ LIB_FILE = libtracecmd.a
 
 trace-read.o::          parse-events.h
 trace-cmd.o::           parse-events.h $(LIB_FILE)
+trace-util.o::          parse-events.h
+trace-ftrace.o::        parse-events.h
 
 trace-cmd:: trace-cmd.o trace-read.o
         $(CC) $^ $(LIBS) -rdynamic -o $@
diff --git a/parse-events.h b/parse-events.h
index 074adb1..dbc1134 100644
--- a/parse-events.h
+++ b/parse-events.h
@@ -202,9 +202,6 @@ struct record {
         void *data;
 };
 
-struct record *trace_peek_data(int cpu);
-struct record *trace_read_data(int cpu);
-
 extern int old_format;
 
 void parse_set_info(int nr_cpus, int long_sz);
diff --git a/trace-cmd.h b/trace-cmd.h
index 34e4012..5c9a405 100644
--- a/trace-cmd.h
+++ b/trace-cmd.h
@@ -44,5 +44,7 @@ tracecmd_read_data(struct tracecmd_handle *handle, int cpu);
 
 int tracecmd_ftrace_overrides(void);
 
+/* hack for function graph work around */
+extern __thread struct tracecmd_handle *tracecmd_curr_thread_handle;
 
 #endif /* _TRACE_CMD_H */
diff --git a/trace-ftrace.c b/trace-ftrace.c
index 16b012e..2a6c227 100644
--- a/trace-ftrace.c
+++ b/trace-ftrace.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "parse-events.h"
+#include "trace-cmd.h"
 
 static struct event *fgraph_ret_event;
 static int fgraph_ret_id;
@@ -86,7 +86,7 @@ get_return_for_leaf(struct trace_seq *s, int cpu, int cur_pid,
                 return NULL;
 
         /* this is a leaf, now advance the iterator */
-        return trace_read_data(cpu);
+        return tracecmd_read_data(tracecmd_curr_thread_handle, cpu);
 }
 
 /* Signal a overhead of time execution to the output */
@@ -241,7 +241,7 @@ fgraph_ent_handler(struct trace_seq *s, void *data, int size,
         memcpy(copy_data, data, size);
         data = copy_data;
 
-        rec = trace_peek_data(cpu);
+        rec = tracecmd_peek_data(tracecmd_curr_thread_handle, cpu);
         if (rec)
                 rec = get_return_for_leaf(s, cpu, pid, val, rec);
         if (rec)
diff --git a/trace-input.c b/trace-input.c
index 77db2f5..c3085b8 100644
--- a/trace-input.c
+++ b/trace-input.c
@@ -18,6 +18,7 @@
 
 #include "trace-cmd.h"
 
+
 struct cpu_data {
         unsigned long long      offset;
         unsigned long long      size;
@@ -39,6 +40,7 @@ struct tracecmd_handle {
         struct cpu_data *cpu_data;
 };
 
+__thread struct tracecmd_handle *tracecmd_curr_thread_handle;
 
 static int do_read(struct tracecmd_handle *handle, void *data, int size)
 {
@@ -588,6 +590,9 @@ tracecmd_peek_data(struct tracecmd_handle *handle, int cpu)
         unsigned int delta;
         unsigned int length;
 
+        /* Hack to work around function graph read ahead */
+        tracecmd_curr_thread_handle = handle;
+
         if (handle->cpu_data[cpu].next)
                 return handle->cpu_data[cpu].next;
 
@@ -624,7 +629,7 @@ read_again:
         if (index >= handle->cpu_data[cpu].page_size) {
                 if (get_next_page(handle, cpu))
                         return NULL;
-                return trace_peek_data(cpu);
+                return tracecmd_peek_data(handle, cpu);
         }
 
         if (old_format) {
@@ -700,7 +705,7 @@ tracecmd_read_data(struct tracecmd_handle *handle, int cpu)
 {
         struct record *data;
 
-        data = trace_peek_data(cpu);
+        data = tracecmd_peek_data(handle, cpu);
         handle->cpu_data[cpu].next = NULL;
 
         return data;
diff --git a/trace-read.c b/trace-read.c
index 1c30f46..7fb4021 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -48,26 +48,12 @@ static int filter_cpu = -1;
 
 struct tracecmd_handle *trace_handle;
 
-struct record *trace_peek_data(int cpu)
-{
-        /* work around for libparsevent */
-
-        return tracecmd_peek_data(trace_handle, cpu);
-}
-
-struct record *trace_read_data(int cpu)
-{
-        /* work around for libparsevent */
-
-        return tracecmd_read_data(trace_handle, cpu);
-}
-
-static void show_data(int cpu)
+static void show_data(struct tracecmd_handle *handle, int cpu)
 {
         struct record *record;
         struct trace_seq s;
 
-        record = trace_read_data(cpu);
+        record = tracecmd_read_data(handle, cpu);
 
         trace_seq_init(&s);
         pevent_print_event(&s, cpu, record->data, record->size, record->ts);
@@ -131,7 +117,7 @@ static void read_data_info(struct tracecmd_handle *handle)
                         }
                 }
                 if (next >= 0)
-                        show_data(next);
+                        show_data(handle, next);
 
         } while (next >= 0);
 }