3 files changed, 47 insertions, 8 deletions

diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index 7efced0c3078..ee55c2eca482 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -3,6 +3,7 @@
 
 #ifdef CONFIG_SCHED_OVERHEAD_TRACE
 
+
 #include <litmus/feather_trace.h>
 #include <litmus/feather_buffer.h>
 
@@ -32,11 +33,14 @@ feather_callback void save_timestamp_def(unsigned long event, unsigned long type
 feather_callback void save_timestamp_task(unsigned long event, unsigned long t_ptr);
 feather_callback void save_timestamp_cpu(unsigned long event, unsigned long cpu);
 feather_callback void save_task_latency(unsigned long event, unsigned long when_ptr);
+feather_callback void save_timestamp_time(unsigned long event, unsigned long time_ptr);
 
 #define TIMESTAMP(id) ft_event0(id, save_timestamp)
 
 #define DTIMESTAMP(id, def)  ft_event1(id, save_timestamp_def, (unsigned long) def)
 
+#define TIMESTAMP_CUR(id) DTIMESTAMP(id, is_realtime(current) ? TSK_RT : TSK_BE)
+
 #define TTIMESTAMP(id, task) \
         ft_event1(id, save_timestamp_task, (unsigned long) task)
 
@@ -46,18 +50,25 @@ feather_callback void save_task_latency(unsigned long event, unsigned long when_
 #define LTIMESTAMP(id, task) \
         ft_event1(id, save_task_latency, (unsigned long) task)
 
+#define TIMESTAMP_TIME(id, time_ptr) \
+        ft_event1(id, save_timestamp_time, (unsigned long) time_ptr)
+
 #else /* !CONFIG_SCHED_OVERHEAD_TRACE */
 
 #define TIMESTAMP(id)        /* no tracing */
 
 #define DTIMESTAMP(id, def)  /* no tracing */
 
+#define TIMESTAMP_CUR(id)    /* no tracing */
+
 #define TTIMESTAMP(id, task) /* no tracing */
 
 #define CTIMESTAMP(id, cpu)  /* no tracing */
 
 #define LTIMESTAMP(id, when_ptr) /* no tracing */
 
+#define TIMESTAMP_TIME(id, time_ptr) /* no tracing */
+
 #endif
 
 
@@ -69,7 +80,20 @@ feather_callback void save_task_latency(unsigned long event, unsigned long when_
  * always the next number after the start time event id.
  */
 
+#define __TS_SYSCALL_IN_START(p)        TIMESTAMP_TIME(10, p)
+#define TS_SYSCALL_IN_END               TIMESTAMP_CUR(11)
 
+#define TS_SYSCALL_OUT_START            TIMESTAMP_CUR(20)
+#define TS_SYSCALL_OUT_END              TIMESTAMP_CUR(21)
+
+#define TS_LOCK_START                   TIMESTAMP_CUR(30)
+#define TS_LOCK_END                     TIMESTAMP_CUR(31)
+
+#define TS_LOCK_SUSPEND                 TIMESTAMP_CUR(38)
+#define TS_LOCK_RESUME                  TIMESTAMP_CUR(39)
+
+#define TS_UNLOCK_START                 TIMESTAMP_CUR(40)
+#define TS_UNLOCK_END                   TIMESTAMP_CUR(41)
 
 #define TS_SCHED_START                  DTIMESTAMP(100, TSK_UNKNOWN) /* we only
                                                                       * care
@@ -101,14 +125,6 @@ feather_callback void save_task_latency(unsigned long event, unsigned long when_
 #define TS_EXIT_NP_START                TIMESTAMP(150)
 #define TS_EXIT_NP_END                  TIMESTAMP(151)
 
-#define TS_LOCK_START                   TIMESTAMP(170)
-#define TS_LOCK_SUSPEND                 TIMESTAMP(171)
-#define TS_LOCK_RESUME                  TIMESTAMP(172)
-#define TS_LOCK_END                     TIMESTAMP(173)
-
-#define TS_UNLOCK_START                 TIMESTAMP(180)
-#define TS_UNLOCK_END                   TIMESTAMP(181)
-
 #define TS_SEND_RESCHED_START(c)        CTIMESTAMP(190, c)
 #define TS_SEND_RESCHED_END             DTIMESTAMP(191, TSK_UNKNOWN)
 
diff --git a/litmus/locking.c b/litmus/locking.c
index ca5a073a989e..df7d0a939c08 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -2,6 +2,8 @@
 
 #ifdef CONFIG_LITMUS_LOCKING
 
+#include <linux/sched.h>
+#include <litmus/litmus.h>
 #include <litmus/sched_plugin.h>
 #include <litmus/trace.h>
 #include <litmus/wait.h>
diff --git a/litmus/trace.c b/litmus/trace.c
index 7d726a8e8e02..fc1d03f35d39 100644
--- a/litmus/trace.c
+++ b/litmus/trace.c
@@ -74,6 +74,7 @@ static void __add_timestamp_user(struct timestamp *pre_recorded)
         if (ft_buffer_start_write(trace_ts_buf, (void**)  &ts)) {
                 *ts = *pre_recorded;
                 ts->seq_no = seq_no;
+                ts->cpu    = raw_smp_processor_id();
                 __save_irq_flags(ts);
                 ft_buffer_finish_write(trace_ts_buf, ts);
         }
@@ -136,6 +137,26 @@ feather_callback void save_task_latency(unsigned long event,
         }
 }
 
+/* fake timestamp to user-reported time */
+void save_timestamp_time(unsigned long event,
+                         unsigned long ptr)
+{
+        uint64_t* time = (uint64_t*) ptr;
+        unsigned int seq_no;
+        struct timestamp *ts;
+        seq_no = fetch_and_inc((int *) &ts_seq_no);
+        if (ft_buffer_start_write(trace_ts_buf, (void**)  &ts)) {
+                ts->event     = event;
+                ts->seq_no    = seq_no;
+                ts->pid       = current->pid;
+                ts->cpu       = raw_smp_processor_id();
+                ts->task_type = is_realtime(current) ? TSK_RT : TSK_BE;
+                __save_irq_flags(ts);
+                ts->timestamp = *time;
+                ft_buffer_finish_write(trace_ts_buf, ts);
+        }
+}
+
 /******************************************************************************/
 /*                        DEVICE FILE DRIVER                                  */
 /******************************************************************************/