diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-21 19:24:13 -0400 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-21 19:24:13 -0400 |
commit | bf57086c9aa497c016efc208a0ceb66f262ab18b (patch) | |
tree | a5983b5eefd34d4b59595b27f6904b6194b3bcf6 | |
parent | 33f5fe82661086d27467821aaf418364774e360a (diff) |
Make GSN-EDF work with simlified binheap_delete()
-rw-r--r-- | litmus/sched_gsn_edf.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c index 549a4dad037d..ea83201319d7 100644 --- a/litmus/sched_gsn_edf.c +++ b/litmus/sched_gsn_edf.c | |||
@@ -141,7 +141,7 @@ static int cpu_lower_prio(struct binheap_node *_a, struct binheap_node *_b) | |||
141 | static void update_cpu_position(cpu_entry_t *entry) | 141 | static void update_cpu_position(cpu_entry_t *entry) |
142 | { | 142 | { |
143 | if (likely(entry->in_heap)) | 143 | if (likely(entry->in_heap)) |
144 | binheap_delete(&entry->hn, &gsnedf_cpu_heap, cpu_entry_t, hn); | 144 | binheap_delete(&entry->hn, &gsnedf_cpu_heap); |
145 | binheap_add(&entry->hn, &gsnedf_cpu_heap, cpu_entry_t, hn); | 145 | binheap_add(&entry->hn, &gsnedf_cpu_heap, cpu_entry_t, hn); |
146 | entry->in_heap = 1; | 146 | entry->in_heap = 1; |
147 | } | 147 | } |
@@ -666,8 +666,7 @@ static void set_priority_inheritance(struct task_struct* t, struct task_struct* | |||
666 | * We can't use heap_decrease() here since | 666 | * We can't use heap_decrease() here since |
667 | * the cpu_heap is ordered in reverse direction, so | 667 | * the cpu_heap is ordered in reverse direction, so |
668 | * it is actually an increase. */ | 668 | * it is actually an increase. */ |
669 | binheap_delete(&gsnedf_cpus[linked_on]->hn, | 669 | binheap_delete(&gsnedf_cpus[linked_on]->hn, &gsnedf_cpu_heap); |
670 | &gsnedf_cpu_heap, cpu_entry_t, hn); | ||
671 | binheap_add(&gsnedf_cpus[linked_on]->hn, | 670 | binheap_add(&gsnedf_cpus[linked_on]->hn, |
672 | &gsnedf_cpu_heap, cpu_entry_t, hn); | 671 | &gsnedf_cpu_heap, cpu_entry_t, hn); |
673 | } else { | 672 | } else { |