3 files changed, 26 insertions, 0 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index b5d8abb4aea5..5883a67c5750 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -127,6 +127,16 @@ void srp_ceiling_block(void);
 
 #define bheap2task(hn) ((struct task_struct*) hn->value)
 
+static inline struct control_page* get_control_page(struct task_struct *t)
+{
+        return tsk_rt(t)->ctrl_page;
+}
+
+static inline int has_control_page(struct task_struct* t)
+{
+        return tsk_rt(t)->ctrl_page != NULL;
+}
+
 #ifdef CONFIG_NP_SECTION
 
 static inline int is_kernel_np(struct task_struct *t)
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 3fb3c76225f2..57496662afde 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -66,6 +66,9 @@ struct control_page {
          * its non-preemptive section? */
         int delayed_preemption;
 
+        /* locking overhead tracing: time stamp prior to system call */
+        uint64_t ts_syscall_start; /* Feather-Trace cycles */
+
         /* to be extended */
 };
 
diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index 3f0743ec9063..5aba68f18893 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -29,6 +29,7 @@ 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)
 
@@ -43,6 +44,9 @@ 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 */
@@ -55,6 +59,8 @@ feather_callback void save_task_latency(unsigned long event, unsigned long when_
 
 #define LTIMESTAMP(id, when_ptr) /* no tracing */
 
+#define TIMESTAMP_TIME(id, time_ptr) /* no tracing */
+
 #endif
 
 
@@ -106,6 +112,13 @@ feather_callback void save_task_latency(unsigned long event, unsigned long when_
 #define TS_UNLOCK_START                 TIMESTAMP(180)
 #define TS_UNLOCK_END                   TIMESTAMP(181)
 
+#define TS_SYSCALL_IN_START(p)          TIMESTAMP_TIME(190, p)
+#define TS_SYSCALL_IN_END               TIMESTAMP(191)
+
+#define TS_SYSCALL_OUT_START            TIMESTAMP(200)
+#define TS_SYSCALL_OUT_END              TIMESTAMP(201)
+
+
 #define TS_SEND_RESCHED_START(c)        CTIMESTAMP(190, c)
 #define TS_SEND_RESCHED_END             DTIMESTAMP(191, TSK_UNKNOWN)