record task type in feather trace time stamp

3 files changed, 67 insertions, 34 deletions

diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index ad7a782a97..ff670c5a15 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -9,28 +9,42 @@
 
 /*********************** TIMESTAMPS ************************/
 
+enum task_type_marker {
+        TSK_BE,
+        TSK_RT,
+        TSK_UNKNOWN
+};
+
 struct timestamp {
         uint64_t                timestamp;
         uint32_t                seq_no;
-        uint16_t                cpu;
-        uint16_t                event;
+        uint8_t                 cpu;
+        uint8_t                 event;
+        uint8_t                 task_type;
 };
 
 
 /* buffer holding time stamps - will be provided by driver */
 extern struct ft_buffer* trace_ts_buf;
 
-/* save_timestamp:  stores current time as struct timestamp
- * in trace_ts_buf
- */
-asmlinkage void save_timestamp(unsigned long event);
+/* tracing callbacks */
+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);
 
 #define TIMESTAMP(id) ft_event0(id, save_timestamp)
 
+#define DTIMESTAMP(id, def)  ft_event1(id, save_timestamp_def, def)
+
+#define TTIMESTAMP(id, task) ft_event1(id, save_timestamp_task, task)
 
 #else /* !CONFIG_FEATHER_TRACE */
 
-#define TIMESTAMP(id) /* no tracing */
+#define TIMESTAMP(id)        /* no tracing */
+
+#define DTIMESTAMP(id, def)  /* no tracing */
+
+#define TTIMESTAMP(id, task) /* no tracing */
 
 #endif
 
@@ -43,26 +57,26 @@ asmlinkage void save_timestamp(unsigned long event);
  * always the next number after the start time event id.
  */
 
-#define TS_SCHED_START                  TIMESTAMP(100)
-#define TS_SCHED_END                    TIMESTAMP(101)
-#define TS_SCHED2_START                 TIMESTAMP(102)
-#define TS_SCHED2_END                   TIMESTAMP(103)
+#define TS_SCHED_START(t)               TTIMESTAMP(100, t)
+#define TS_SCHED_END(t)                 TTIMESTAMP(101, t)
+#define TS_SCHED2_START(t)              TTIMESTAMP(102, t)
+#define TS_SCHED2_END(t)                TTIMESTAMP(103, t)
 
-#define TS_CXS_START                    TIMESTAMP(104)
-#define TS_CXS_END                      TIMESTAMP(105)
+#define TS_CXS_START(t)                 TTIMESTAMP(104, t)
+#define TS_CXS_END(t)                   TTIMESTAMP(105, t)
 
-#define TS_RELEASE_START                TIMESTAMP(106)
-#define TS_RELEASE_END                  TIMESTAMP(107)
+#define TS_RELEASE_START                DTIMESTAMP(106, TSK_RT)
+#define TS_RELEASE_END                  DTIMESTAMP(107, TSK_RT)
 
-#define TS_TICK_START                   TIMESTAMP(110)
-#define TS_TICK_END                     TIMESTAMP(111)
+#define TS_TICK_START(t)                TTIMESTAMP(110, t)
+#define TS_TICK_END(t)                  TTIMESTAMP(111, t)
 
 
-#define TS_PLUGIN_SCHED_START           TIMESTAMP(120)
-#define TS_PLUGIN_SCHED_END             TIMESTAMP(121)
+#define TS_PLUGIN_SCHED_START           /* TIMESTAMP(120) */  /* currently unused */
+#define TS_PLUGIN_SCHED_END             /* TIMESTAMP(121) */
 
-#define TS_PLUGIN_TICK_START            TIMESTAMP(130)
-#define TS_PLUGIN_TICK_END              TIMESTAMP(131)
+#define TS_PLUGIN_TICK_START            /* TIMESTAMP(130) */
+#define TS_PLUGIN_TICK_END              /* TIMESTAMP(131) */
 
 #define TS_ENTER_NP_START               TIMESTAMP(140)
 #define TS_ENTER_NP_END                 TIMESTAMP(141)
diff --git a/kernel/sched.c b/kernel/sched.c
index 7bc6f9a1bb..7f1de34b1c 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3493,7 +3493,7 @@ void scheduler_tick(void)
         struct task_struct *curr = rq->curr;
         u64 next_tick = rq->tick_timestamp + TICK_NSEC;
 
-        TS_TICK_START;
+        TS_TICK_START(current);
         spin_lock(&rq->lock);
         __update_rq_clock(rq);
         /*
@@ -3515,7 +3515,7 @@ void scheduler_tick(void)
         if (!is_realtime(current))
                 trigger_load_balance(rq, cpu);
 #endif
-        TS_TICK_END;
+        TS_TICK_END(current);
 }
 
 #if defined(CONFIG_PREEMPT) && defined(CONFIG_DEBUG_PREEMPT)
@@ -3654,7 +3654,7 @@ need_resched:
 
         release_kernel_lock(prev);
 need_resched_nonpreemptible:
-        TS_SCHED_START;
+        TS_SCHED_START(prev);
 
         schedule_debug(prev);
 
@@ -3692,30 +3692,30 @@ need_resched_nonpreemptible:
                 rq->curr = next;
                 ++*switch_count;
 
-                TS_SCHED_END;
-                TS_CXS_START;
+                TS_SCHED_END(next);
+                TS_CXS_START(prev);
                 context_switch(rq, prev, next); /* unlocks the rq */
-                TS_CXS_END;
+                TS_CXS_END(current);
         } else {
-                TS_SCHED_END;
+                TS_SCHED_END(prev);
                 spin_unlock_irq(&rq->lock);
         }
-        TS_SCHED2_START;
+        TS_SCHED2_START(current);
 
         tick_no_rqlock();
 
         if (unlikely(reacquire_kernel_lock(current) < 0)) {
                 cpu = smp_processor_id();
                 rq = cpu_rq(cpu);
-                TS_SCHED2_END;
+                TS_SCHED2_END(current);
                 goto need_resched_nonpreemptible;
         }
         preempt_enable_no_resched();
         if (unlikely(test_thread_flag(TIF_NEED_RESCHED))) {
-                TS_SCHED2_END;
+                TS_SCHED2_END(current);
                 goto need_resched;
         }
-        TS_SCHED2_END;
+        TS_SCHED2_END(current);
         if (srp_active())
                 srp_ceiling_block();
 }
diff --git a/litmus/trace.c b/litmus/trace.c
index 0c1916f507..bfe4ed4467 100644
--- a/litmus/trace.c
+++ b/litmus/trace.c
@@ -5,6 +5,7 @@
 #include <asm/uaccess.h>
 #include <linux/module.h>
 
+#include <litmus/litmus.h>
 #include <litmus/trace.h>
 
 /******************************************************************************/
@@ -15,19 +16,37 @@ struct ft_buffer* trace_ts_buf = NULL;
 
 static unsigned int ts_seq_no = 0;
 
-feather_callback void save_timestamp(unsigned long event)
+static inline void __save_timestamp(unsigned long event, uint8_t type)
 {
-        unsigned int seq_no = fetch_and_inc((int *) &ts_seq_no);
+        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->timestamp = ft_timestamp();
                 ts->seq_no    = seq_no;
                 ts->cpu       = raw_smp_processor_id();
+                ts->task_type = type;
                 ft_buffer_finish_write(trace_ts_buf, ts);
         }
 }
 
+feather_callback void save_timestamp(unsigned long event)
+{
+        __save_timestamp(event, TSK_UNKNOWN);
+}
+
+feather_callback void save_timestamp_def(unsigned long event, unsigned long type)
+{
+        __save_timestamp(event, (uint8_t) type);
+}
+
+feather_callback void save_timestamp_task(unsigned long event, unsigned long t_ptr)
+{
+        int rt = is_realtime((struct task_struct *) t_ptr);
+        __save_timestamp(event, rt ? TSK_RT : TSK_BE);
+}
+
 static struct ft_buffer* alloc_ft_buffer(unsigned int count, size_t size)
 {
         struct ft_buffer* buf;