Merge branch 'wip-mc' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/litmus2010 into wip-mc

Conflicts:
	include/litmus/trace.h

3 files changed, 50 insertions, 6 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 2112eecd1dc8..4322d59c0e8f 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -129,6 +129,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)
@@ -244,4 +254,8 @@ static inline quanta_t time2quanta(lt_t time, enum round round)
 /* By how much is cpu staggered behind CPU 0? */
 u64 cpu_stagger_offset(int cpu);
 
+#define TS_SYSCALL_IN_START                                             \
+        if (has_control_page(current))                                  \
+                __TS_SYSCALL_IN_START(&get_control_page(current)->ts_syscall_start);
+
 #endif
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index e6288e8807f0..221edad83d77 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -63,6 +63,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 95e1ee647a8a..d6829c416912 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -28,7 +28,8 @@ feather_callback void save_timestamp(unsigned long event);
 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)
 
@@ -40,6 +41,14 @@ feather_callback void save_timestamp_cpu(unsigned long event, unsigned long cpu)
 #define CTIMESTAMP(id, cpu) \
         ft_event1(id, save_timestamp_cpu, (unsigned long) cpu)
 
+#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)
+
+#define TIMESTAMP_PID(id) ft_event0(id, save_timestamp_pid)
+
 #else /* !CONFIG_SCHED_OVERHEAD_TRACE */
 
 #define TIMESTAMP(id)        /* no tracing */
@@ -50,6 +59,12 @@ feather_callback void save_timestamp_cpu(unsigned long event, unsigned long cpu)
 
 #define CTIMESTAMP(id, cpu)  /* no tracing */
 
+#define LTIMESTAMP(id, when_ptr) /* no tracing */
+
+#define TIMESTAMP_TIME(id, time_ptr) /* no tracing */
+
+#define TIMESTAMP_PID(id) /* no tracing */
+
 #endif
 
 
@@ -61,6 +76,21 @@ feather_callback void save_timestamp_cpu(unsigned long event, unsigned long cpu)
  * 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_PID(11)
+
+#define TS_SYSCALL_OUT_START            TIMESTAMP_PID(20)
+#define TS_SYSCALL_OUT_END              TIMESTAMP_PID(21)
+
+#define TS_LOCK_START                   TIMESTAMP_PID(30)
+#define TS_LOCK_END                     TIMESTAMP_PID(31)
+
+#define TS_LOCK_SUSPEND                 TIMESTAMP_PID(38)
+#define TS_LOCK_RESUME                  TIMESTAMP_PID(39)
+
+#define TS_UNLOCK_START                 TIMESTAMP_PID(40)
+#define TS_UNLOCK_END                   TIMESTAMP_PID(41)
+
 #define TS_SCHED_START                  DTIMESTAMP(100, TSK_UNKNOWN) /* we only
                                                                       * care
                                                                       * about
@@ -91,12 +121,9 @@ feather_callback void save_timestamp_cpu(unsigned long event, unsigned long cpu)
 #define TS_EXIT_NP_START                TIMESTAMP(150)
 #define TS_EXIT_NP_END                  TIMESTAMP(151)
 
-#define TS_LOCK_START                   TIMESTAMP(170)
-#define TS_LOCK_END                     TIMESTAMP(171)
-#define TS_UNLOCK_START                 TIMESTAMP(172)
-#define TS_UNLOCK_END                   TIMESTAMP(173)
-
 #define TS_SEND_RESCHED_START(c)        CTIMESTAMP(190, c)
 #define TS_SEND_RESCHED_END             DTIMESTAMP(191, TSK_UNKNOWN)
 
+#define TS_RELEASE_LATENCY(when)        LTIMESTAMP(208, &(when))
+
 #endif /* !_SYS_TRACE_H_ */