Sperated b and c overheads

5 files changed, 34 insertions, 4 deletions

diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h
index f98d47ccbb0b..3783cdaa00c5 100644
--- a/include/litmus/rt_domain.h
+++ b/include/litmus/rt_domain.h
@@ -8,6 +8,7 @@
 #include <litmus/bheap.h>
 #include <litmus/domain.h>
 #include <litmus/event_group.h>
+#include <litmus/sched_mc.h>
 
 #define RELEASE_QUEUE_SLOTS 127 /* prime */
 
@@ -50,6 +51,8 @@ typedef struct _rt_domain {
 
         /* how are tasks ordered in the ready queue? */
         bheap_prio_t                    order;
+
+        enum crit_level                 level;
 } rt_domain_t;
 
 struct release_heap {
diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index e0c84716d87a..6e720f865cc0 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -13,7 +13,9 @@ enum task_type_marker {
         TSK_BE,
         TSK_RT,
         TSK_UNKNOWN,
-        TSK_LVLA
+        TSK_LVLA,
+        TSK_LVLB,
+        TSK_LVLC
 };
 
 struct timestamp {
@@ -116,6 +118,19 @@ feather_callback void save_timestamp_time(unsigned long event, unsigned long tim
 #define TS_LVLA_SCHED_END_ID            115
 #define TS_LVLA_SCHED_END(t)            TTIMESTAMP(TS_LVLA_SCHED_END_ID, t)
 
+#define TS_LVLB_RELEASE_START           DTIMESTAMP(116, TSK_RT)
+#define TS_LVLB_RELEASE_END             DTIMESTAMP(117, TSK_RT)
+
+#define TS_LVLB_SCHED_START             DTIMESTAMP(118, TSK_UNKNOWN)
+#define TS_LVLB_SCHED_END_ID            119
+#define TS_LVLB_SCHED_END(t)            TTIMESTAMP(TS_LVLA_SCHED_END_ID, t)
+
+#define TS_LVLC_RELEASE_START           DTIMESTAMP(120, TSK_RT)
+#define TS_LVLC_RELEASE_END             DTIMESTAMP(121, TSK_RT)
+
+#define TS_LVLC_SCHED_START             DTIMESTAMP(122, TSK_UNKNOWN)
+#define TS_LVLC_SCHED_END_ID            123
+#define TS_LVLC_SCHED_END(t)            TTIMESTAMP(TS_LVLA_SCHED_END_ID, t)
 
 #define TS_PLUGIN_SCHED_START           /* TIMESTAMP(120) */  /* currently unused */
 #define TS_PLUGIN_SCHED_END             /* TIMESTAMP(121) */
diff --git a/kernel/sched.c b/kernel/sched.c
index 71907dcd8112..093df593e45d 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3811,6 +3811,8 @@ need_resched:
 need_resched_nonpreemptible:
         TS_SCHED_START;
         TS_LVLA_SCHED_START;
+        TS_LVLB_SCHED_START;
+        TS_LVLC_SCHED_START;
         sched_trace_task_switch_away(prev);
 
         schedule_debug(prev);
@@ -3861,6 +3863,8 @@ need_resched_nonpreemptible:
                 ++*switch_count;
 
                 TS_LVLA_SCHED_END(next);
+                TS_LVLB_SCHED_END(next);
+                TS_LVLC_SCHED_END(next);
                 TS_SCHED_END(next);
                 TS_CXS_START(next);
                 context_switch(rq, prev, next); /* unlocks the rq */
diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index e6ccf04cecf0..b615092ce9c9 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -52,7 +52,11 @@ static unsigned int time2slot(lt_t time)
 static void do_release(struct release_heap *rh)
 {
         unsigned long flags;
-        TS_RELEASE_START;
+
+        if (CRIT_LEVEL_B == rh->dom->level)
+                TS_LVLB_RELEASE_START;
+        else
+                TS_LVLC_RELEASE_START;
 
         raw_spin_lock_irqsave(&rh->dom->release_lock, flags);
         VTRACE("CB has the release_lock 0x%p\n", &rh->dom->release_lock);
@@ -64,7 +68,10 @@ static void do_release(struct release_heap *rh)
         /* call release callback */
         rh->dom->release_jobs(rh->dom, &rh->heap);
 
-        TS_RELEASE_END;
+        if (CRIT_LEVEL_B == rh->dom->level)
+                TS_LVLB_RELEASE_END;
+        else
+                TS_LVLC_RELEASE_END;
 }
 
 #ifdef CONFIG_MERGE_TIMERS
diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index b43064ab63b6..5eaaa4734fa3 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -1246,11 +1246,12 @@ static void init_global_domain(struct domain_data *dom_data, enum crit_level lev
 }
 
 static inline void init_edf_domain(struct domain *dom, rt_domain_t *rt,
-                                   int prio, int is_partitioned, int cpu)
+                                   enum crit_level prio, int is_partitioned, int cpu)
 {
         pd_domain_init(dom, rt, edf_ready_order, NULL,
                        mc_release_jobs, mc_preempt_needed,
                        edf_higher_prio);
+        rt->level = prio;
 #if defined(CONFIG_PLUGIN_MC_RELEASE_MASTER) && defined(CONFIG_MERGE_TIMERS)
         /* All timers are on one CPU and release-master is using the event
          * merging interface as well. */