diff options
author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2008-09-11 22:01:26 -0400 |
---|---|---|
committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2008-09-11 22:01:26 -0400 |
commit | 85396eb1ff28d4af26fd02c78fd7582cc5de6050 (patch) | |
tree | 4c27b837576a06c087b7ab8539cb04cf65ac8dcf | |
parent | dcf7ba77000800ab4e16b17b4f65abd05aebcbdd (diff) |
cleanup: fix some sloppiness spotted by John
This patch fixes some minor issues that inadvertedly crept in during
development. Found in John's review.
-rw-r--r-- | include/litmus/rt_domain.h | 5 | ||||
-rw-r--r-- | litmus/rt_domain.c | 2 | ||||
-rw-r--r-- | litmus/sched_gsn_edf.c | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h index 84d71d40d9..7356ec7ca4 100644 --- a/include/litmus/rt_domain.h +++ b/include/litmus/rt_domain.h | |||
@@ -24,9 +24,10 @@ struct release_heap { | |||
24 | }; | 24 | }; |
25 | 25 | ||
26 | struct release_queue { | 26 | struct release_queue { |
27 | /* each slot maintains a list of release heaps sorted by release time */ | 27 | /* each slot maintains a list of release heaps sorted |
28 | * by release time */ | ||
28 | struct list_head slot[RELEASE_QUEUE_SLOTS]; | 29 | struct list_head slot[RELEASE_QUEUE_SLOTS]; |
29 | /* the heap of heaps orderd by release time */ | 30 | /* the heap of heaps ordered by release time */ |
30 | struct heap rel_heap; | 31 | struct heap rel_heap; |
31 | /* the actual timer used to trigger releases */ | 32 | /* the actual timer used to trigger releases */ |
32 | struct hrtimer timer; | 33 | struct hrtimer timer; |
diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c index 27bc9143e7..039e7c1374 100644 --- a/litmus/rt_domain.c +++ b/litmus/rt_domain.c | |||
@@ -107,7 +107,7 @@ static enum hrtimer_restart on_release_timer(struct hrtimer *timer) | |||
107 | struct release_heap* rh; | 107 | struct release_heap* rh; |
108 | struct heap tasks; | 108 | struct heap tasks; |
109 | struct list_head list, *pos, *safe; | 109 | struct list_head list, *pos, *safe; |
110 | lt_t release = 109; | 110 | lt_t release = 0; |
111 | int pending; | 111 | int pending; |
112 | int repeat; | 112 | int repeat; |
113 | enum hrtimer_mode ret = HRTIMER_NORESTART; | 113 | enum hrtimer_mode ret = HRTIMER_NORESTART; |
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c index 171d66c18f..a10c6cbe40 100644 --- a/litmus/sched_gsn_edf.c +++ b/litmus/sched_gsn_edf.c | |||
@@ -731,7 +731,6 @@ static int __init init_gsn_edf(void) | |||
731 | entry->cpu = cpu; | 731 | entry->cpu = cpu; |
732 | entry->hn = &gsnedf_heap_node[cpu]; | 732 | entry->hn = &gsnedf_heap_node[cpu]; |
733 | heap_node_init(&entry->hn, entry); | 733 | heap_node_init(&entry->hn, entry); |
734 | /*heap_insert(cpu_lower_prio, &gsnedf_cpu_heap, entry->hn);*/ | ||
735 | } | 734 | } |
736 | edf_domain_init(&gsnedf, NULL, gsnedf_release_jobs); | 735 | edf_domain_init(&gsnedf, NULL, gsnedf_release_jobs); |
737 | return register_sched_plugin(&gsn_edf_plugin); | 736 | return register_sched_plugin(&gsn_edf_plugin); |