Merge branch 'wip-color' into wip-mc

Conflicts:
	include/litmus/budget.h
	include/litmus/litmus.h
	include/litmus/rt_param.h
	include/litmus/sched_trace.h
	include/litmus/trace.h
	include/trace/events/litmus.h
	litmus/Makefile
	litmus/budget.c
	litmus/ftdev.c
	litmus/jobs.c
	litmus/litmus.c
	litmus/locking.c
	litmus/preempt.c
	litmus/rt_domain.c
	litmus/sched_gsn_edf.c
	litmus/trace.c

1 files changed, 11 insertions, 26 deletions

diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index c1bbf168e6d4..d868144f6928 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -23,7 +23,9 @@ struct timestamp {
         uint32_t                seq_no;
         uint8_t                 cpu;
         uint8_t                 event;
-        uint8_t                 task_type;
+        uint8_t                 task_type:2;
+        uint8_t                 irq_flag:1;
+        uint8_t                 irq_count:5;
 };
 
 /* tracing callbacks */
@@ -32,7 +34,6 @@ 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)
 
@@ -47,11 +48,6 @@ feather_callback void save_timestamp_time(unsigned long event, unsigned long tim
 #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 */
@@ -64,10 +60,6 @@ feather_callback void save_timestamp_time(unsigned long event, unsigned long tim
 
 #define LTIMESTAMP(id, when_ptr) /* no tracing */
 
-#define TIMESTAMP_TIME(id, time_ptr) /* no tracing */
-
-#define TIMESTAMP_PID(id) /* no tracing */
-
 #endif
 
 
@@ -79,21 +71,6 @@ feather_callback void save_timestamp_time(unsigned long event, unsigned long tim
  * 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
@@ -144,6 +121,14 @@ feather_callback void save_timestamp_time(unsigned long event, unsigned long tim
 #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)