aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2013-04-10 19:57:35 -0400
committerGlenn Elliott <gelliott@cs.unc.edu>2013-04-10 19:57:35 -0400
commit2f253d08ae00a9cf60c15e0cc5af560f75b3df2a (patch)
tree5ee98a2372589b7f5c5d119b5d6f2f2f7de6033f
parentb7535577132d5d9c81c10c07a1776eacde6e5a44 (diff)
less verbose tracing in ikglp
-rw-r--r--litmus/ikglp_lock.c21
-rw-r--r--litmus/sched_cedf.c2
2 files changed, 12 insertions, 11 deletions
diff --git a/litmus/ikglp_lock.c b/litmus/ikglp_lock.c
index d9c263eee34a..4963820eaee2 100644
--- a/litmus/ikglp_lock.c
+++ b/litmus/ikglp_lock.c
@@ -221,6 +221,7 @@ static void __ikglp_dump_fifoq(int i, struct fifo_queue* fq)
221 } 221 }
222} 222}
223 223
224__attribute__ ((unused))
224static void __ikglp_dump_state(struct ikglp_semaphore *sem) 225static void __ikglp_dump_state(struct ikglp_semaphore *sem)
225{ 226{
226 int i; 227 int i;
@@ -1856,13 +1857,13 @@ void ikglp_budget_exhausted(struct litmus_lock* l, struct task_struct* t)
1856 if (blocked_lock == l) { 1857 if (blocked_lock == l) {
1857 ikglp_wait_state_t *wait; 1858 ikglp_wait_state_t *wait;
1858 1859
1859 TRACE_TASK(t, "IKGLP before reject:\n"); 1860// TRACE_TASK(t, "IKGLP before reject:\n");
1860 __ikglp_dump_state(sem); 1861// __ikglp_dump_state(sem);
1861 1862
1862 ikglp_abort_request(sem, t, flags); 1863 ikglp_abort_request(sem, t, flags);
1863 1864
1864 TRACE_TASK(t, "IKGLP after reject (before reissue):\n"); 1865// TRACE_TASK(t, "IKGLP after reject (before reissue):\n");
1865 __ikglp_dump_state(sem); 1866// __ikglp_dump_state(sem);
1866 1867
1867 /* now re-issue the request */ 1868 /* now re-issue the request */
1868 1869
@@ -1898,8 +1899,8 @@ void ikglp_budget_exhausted(struct litmus_lock* l, struct task_struct* t)
1898 ikglp_enqueue_on_donor(sem, wait, flags); // unlocks sem->lock 1899 ikglp_enqueue_on_donor(sem, wait, flags); // unlocks sem->lock
1899 } 1900 }
1900 1901
1901 TRACE_TASK(t, "IKGLP after reissue:\n"); 1902// TRACE_TASK(t, "IKGLP after reissue:\n");
1902 __ikglp_dump_state(sem); 1903// __ikglp_dump_state(sem);
1903 1904
1904 raw_spin_unlock_irqrestore(&sem->real_lock, more_flags); 1905 raw_spin_unlock_irqrestore(&sem->real_lock, more_flags);
1905 } 1906 }
@@ -1949,8 +1950,8 @@ void ikglp_virtual_unlock(struct litmus_lock* l, struct task_struct* t)
1949 goto out; 1950 goto out;
1950 } 1951 }
1951 1952
1952 TRACE_TASK(t, "IKGLP before virtual unlock:\n"); 1953// TRACE_TASK(t, "IKGLP before virtual unlock:\n");
1953 __ikglp_dump_state(sem); 1954// __ikglp_dump_state(sem);
1954 1955
1955 /* Move a request from donor heap or PQ to fq. don't steal from 1956 /* Move a request from donor heap or PQ to fq. don't steal from
1956 * other FQs. Also, terminate donation relationship if we move 1957 * other FQs. Also, terminate donation relationship if we move
@@ -1964,8 +1965,8 @@ void ikglp_virtual_unlock(struct litmus_lock* l, struct task_struct* t)
1964 --(sem->nr_in_fifos); 1965 --(sem->nr_in_fifos);
1965 fq->is_vunlocked = 1; 1966 fq->is_vunlocked = 1;
1966 1967
1967 TRACE_TASK(t, "IKGLP after virtual unlock:\n"); 1968// TRACE_TASK(t, "IKGLP after virtual unlock:\n");
1968 __ikglp_dump_state(sem); 1969// __ikglp_dump_state(sem);
1969 1970
1970out: 1971out:
1971 unlock_fine_irqrestore(&sem->lock, flags); 1972 unlock_fine_irqrestore(&sem->lock, flags);
diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index 879f781cf1aa..09caa509a0f4 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -552,7 +552,7 @@ static noinline void cedf_job_arrival(struct task_struct* task)
552static void cedf_track_on_release(struct bheap_node* n, void* dummy) 552static void cedf_track_on_release(struct bheap_node* n, void* dummy)
553{ 553{
554 struct task_struct* t = bheap2task(n); 554 struct task_struct* t = bheap2task(n);
555 TRACE_TASK(t, "released\n"); 555// TRACE_TASK(t, "released\n");
556 556
557 cedf_track_in_top_m(t); 557 cedf_track_in_top_m(t);
558} 558}