Feather-Trace: trace locking-related suspensions

2 files changed, 10 insertions, 0 deletions

diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index c5c9600c33d8..bd3b36223428 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -18,6 +18,7 @@
 #include <litmus/sched_plugin.h>
 #include <litmus/edf_common.h>
 #include <litmus/sched_trace.h>
+#include <litmus/trace.h>
 
 #include <litmus/preempt.h>
 
@@ -762,6 +763,8 @@ int gsnedf_fmlp_lock(struct litmus_lock* l)
                                 set_priority_inheritance(sem->owner, sem->hp_waiter);
                 }
 
+                TS_LOCK_SUSPEND;
+
                 /* release lock before sleeping */
                 spin_unlock_irqrestore(&sem->wait.lock, flags);
 
@@ -772,6 +775,8 @@ int gsnedf_fmlp_lock(struct litmus_lock* l)
 
                 schedule();
 
+                TS_LOCK_RESUME;
+
                 /* Since we hold the lock, no other task will change
                  * ->owner. We can thus check it without acquiring the spin
                  * lock. */
diff --git a/litmus/sched_psn_edf.c b/litmus/sched_psn_edf.c
index abb06fa53e3a..250c55a1e13d 100644
--- a/litmus/sched_psn_edf.c
+++ b/litmus/sched_psn_edf.c
@@ -20,6 +20,7 @@
 #include <litmus/sched_plugin.h>
 #include <litmus/edf_common.h>
 #include <litmus/sched_trace.h>
+#include <litmus/trace.h>
 
 typedef struct {
         rt_domain_t             domain;
@@ -428,6 +429,8 @@ int psnedf_fmlp_lock(struct litmus_lock* l)
 
                 __add_wait_queue_tail_exclusive(&sem->wait, &wait);
 
+                TS_LOCK_SUSPEND;
+
                 /* release lock before sleeping */
                 spin_unlock_irqrestore(&sem->wait.lock, flags);
 
@@ -438,6 +441,8 @@ int psnedf_fmlp_lock(struct litmus_lock* l)
 
                 schedule();
 
+                TS_LOCK_RESUME;
+
                 /* Since we hold the lock, no other task will change
                  * ->owner. We can thus check it without acquiring the spin
                  * lock. */