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, 8 insertions, 0 deletions

diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index 3b3b49ed48e..79243f92edb 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -57,6 +57,14 @@ static void do_release(struct release_heap *rh)
                 TS_LVLB_RELEASE_START;
         else
                 TS_LVLC_RELEASE_START;
+        struct release_heap* rh;
+        rh = container_of(timer, struct release_heap, timer);
+
+        TS_RELEASE_LATENCY(rh->release_time);
+
+        VTRACE("on_release_timer(0x%p) starts.\n", timer);
+
+        TS_RELEASE_START;
 
         raw_spin_lock_irqsave(&rh->dom->release_lock, flags);
         VTRACE("CB has the release_lock 0x%p\n", &rh->dom->release_lock);