aboutsummaryrefslogtreecommitdiffstats
path: root/litmus/sched_gsn_edf.c
diff options
context:
space:
mode:
authorJonathan Herman <hermanjl@cs.unc.edu>2012-03-30 16:49:30 -0400
committerJonathan Herman <hermanjl@cs.unc.edu>2012-03-30 16:49:30 -0400
commitd47039bb8761a3ac95665a3d5745d1455d48b4d6 (patch)
tree0d1885c43e8561dc6ef820d6ea0381b63703a838 /litmus/sched_gsn_edf.c
parentf14b3c3c9dac4827cfd8d54ecc8e760884356757 (diff)
sched_trace: allow tasks to block on a lock id
Diffstat (limited to 'litmus/sched_gsn_edf.c')
-rw-r--r--litmus/sched_gsn_edf.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index c5c9600c33d8..3d32f74ff51c 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -765,6 +765,8 @@ int gsnedf_fmlp_lock(struct litmus_lock* l)
765 /* release lock before sleeping */ 765 /* release lock before sleeping */
766 spin_unlock_irqrestore(&sem->wait.lock, flags); 766 spin_unlock_irqrestore(&sem->wait.lock, flags);
767 767
768 sched_trace_task_block(t, l->id);
769
768 /* We depend on the FIFO order. Thus, we don't need to recheck 770 /* We depend on the FIFO order. Thus, we don't need to recheck
769 * when we wake up; we are guaranteed to have the lock since 771 * when we wake up; we are guaranteed to have the lock since
770 * there is only one wake up per release. 772 * there is only one wake up per release.
@@ -772,6 +774,8 @@ int gsnedf_fmlp_lock(struct litmus_lock* l)
772 774
773 schedule(); 775 schedule();
774 776
777 sched_trace_task_resume(t, l->id);
778
775 /* Since we hold the lock, no other task will change 779 /* Since we hold the lock, no other task will change
776 * ->owner. We can thus check it without acquiring the spin 780 * ->owner. We can thus check it without acquiring the spin
777 * lock. */ 781 * lock. */