Refactor Feather-Trace

- move platform dependent bits into arch/
- provide a default implementation (used for sparc64)

2 files changed, 22 insertions, 83 deletions

diff --git a/litmus/ft_event.c b/litmus/ft_event.c
index b1d80c52d7..6084b6d6b3 100644
--- a/litmus/ft_event.c
+++ b/litmus/ft_event.c
@@ -2,103 +2,42 @@
 
 #include <litmus/feather_trace.h>
 
-/* the feather trace management functions assume
- * exclusive access to the event table
- */
+#ifndef __ARCH_HAS_FEATHER_TRACE
+/* provide dummy implementation */
 
-
-#define BYTE_JUMP      0xeb
-#define BYTE_JUMP_LEN  0x02
-
-/* for each event, there is an entry in the event table */
-struct trace_event {
-        long    id;
-        long    count;
-        long    start_addr;
-        long    end_addr;
-};
-
-extern struct trace_event  __start___event_table[];
-extern struct trace_event  __stop___event_table[];
+int ft_events[MAX_EVENTS];
 
 int ft_enable_event(unsigned long id)
 {
-        struct trace_event* te = __start___event_table;
-        int count = 0;
-        char* delta;
-        unsigned char* instr;
-
-        while (te < __stop___event_table) {
-                if (te->id == id && ++te->count == 1) {
-                        instr  = (unsigned char*) te->start_addr;
-                        /* make sure we don't clobber something wrong */
-                        if (*instr == BYTE_JUMP) {
-                                delta  = (((unsigned char*) te->start_addr) + 1);
-                                *delta = 0;
-                        }
-                }
-                if (te->id == id)
-                        count++;
-                te++;
-        }
-        return count;
+        if (id < MAX_EVENTS) {
+                ft_events[id]++;
+                return 1;
+        } else
+                return 0;
 }
 
 int ft_disable_event(unsigned long id)
 {
-        struct trace_event* te = __start___event_table;
-        int count = 0;
-        char* delta;
-        unsigned char* instr;
-
-        while (te < __stop___event_table) {
-                if (te->id == id && --te->count == 0) {
-                        instr  = (unsigned char*) te->start_addr;
-                        if (*instr == BYTE_JUMP) {
-                                delta  = (((unsigned char*) te->start_addr) + 1);
-                                *delta = te->end_addr - te->start_addr -
-                                        BYTE_JUMP_LEN;
-                        }
-                }
-                if (te->id == id)
-                        count++;
-                te++;
-        }
-        return count;
+        if (id < MAX_EVENTS && ft_events[id]) {
+                ft_events[id]--;
+                return 1;
+        } else
+                return 0;
 }
 
 int ft_disable_all_events(void)
 {
-        struct trace_event* te = __start___event_table;
-        int count = 0;
-        char* delta;
-        unsigned char* instr;
+        int i;
+
+        for (i = 0; i < MAX_EVENTS; i++)
+                ft_events[i] = 0;
 
-        while (te < __stop___event_table) {
-                if (te->count) {
-                        instr  = (unsigned char*) te->start_addr;
-                        if (*instr == BYTE_JUMP) {
-                                delta  = (((unsigned char*) te->start_addr)
-                                          + 1);
-                                *delta = te->end_addr - te->start_addr -
-                                        BYTE_JUMP_LEN;
-                                te->count = 0;
-                                count++;
-                        }
-                }
-                te++;
-        }
-        return count;
+        return MAX_EVENTS;
 }
 
 int ft_is_event_enabled(unsigned long id)
 {
-        struct trace_event* te = __start___event_table;
-
-        while (te < __stop___event_table) {
-                if (te->id == id)
-                        return te->count;
-                te++;
-        }
-        return 0;
+        return  id < MAX_EVENTS && ft_events[id];
 }
+
+#endif
diff --git a/litmus/trace.c b/litmus/trace.c
index 489e23e8a6..28cfa5b072 100644
--- a/litmus/trace.c
+++ b/litmus/trace.c
@@ -21,7 +21,7 @@ feather_callback void save_timestamp(unsigned long event)
         struct timestamp *ts;
         if (ft_buffer_start_write(trace_ts_buf, (void**)  &ts)) {
                 ts->event     = event;
-                ts->timestamp = ft_read_tsc();
+                ts->timestamp = ft_timestamp();
                 ts->seq_no    = seq_no;
                 ts->cpu       = raw_smp_processor_id();
                 ft_buffer_finish_write(trace_ts_buf, ts);