diff options
Diffstat (limited to 'litmus/edf_common.c')
-rw-r--r-- | litmus/edf_common.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/litmus/edf_common.c b/litmus/edf_common.c index 5ea6b1bc7f24..4b65be7302be 100644 --- a/litmus/edf_common.c +++ b/litmus/edf_common.c | |||
@@ -60,7 +60,7 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second) | |||
60 | first_task = first->rt_param.inh_task; | 60 | first_task = first->rt_param.inh_task; |
61 | } | 61 | } |
62 | if (unlikely(second->rt_param.inh_task) | 62 | if (unlikely(second->rt_param.inh_task) |
63 | #ifdef CONFIG_LITMUS_NESTED_LOCKING | 63 | #ifdef CONFIG_LITMUS_NESTED_LOCKING |
64 | && (second_mode == EFFECTIVE) | 64 | && (second_mode == EFFECTIVE) |
65 | #endif | 65 | #endif |
66 | ) { | 66 | ) { |
@@ -85,24 +85,24 @@ int edf_higher_prio(struct task_struct* first, struct task_struct* second) | |||
85 | 85 | ||
86 | // // rate-monotonic for testing | 86 | // // rate-monotonic for testing |
87 | // return !is_realtime(second_task) || | 87 | // return !is_realtime(second_task) || |
88 | // | 88 | // |
89 | // /* is the deadline of the first task earlier? | 89 | // /* is the deadline of the first task earlier? |
90 | // * Then it has higher priority. | 90 | // * Then it has higher priority. |
91 | // */ | 91 | // */ |
92 | // shorter_period(first_task, second_task) || | 92 | // shorter_period(first_task, second_task) || |
93 | // | 93 | // |
94 | // /* Do we have a deadline tie? | 94 | // /* Do we have a deadline tie? |
95 | // * Then break by PID. | 95 | // * Then break by PID. |
96 | // */ | 96 | // */ |
97 | // (get_period(first_task) == get_period(second_task) && | 97 | // (get_period(first_task) == get_period(second_task) && |
98 | // (first_task->pid < second_task->pid || | 98 | // (first_task->pid < second_task->pid || |
99 | // | 99 | // |
100 | // /* If the PIDs are the same then the task with the EFFECTIVE | 100 | // /* If the PIDs are the same then the task with the EFFECTIVE |
101 | // * priority wins. | 101 | // * priority wins. |
102 | // */ | 102 | // */ |
103 | // (first_task->pid == second_task->pid && | 103 | // (first_task->pid == second_task->pid && |
104 | // !second->rt_param.inh_task))); | 104 | // !second->rt_param.inh_task))); |
105 | 105 | ||
106 | return !is_realtime(second_task) || | 106 | return !is_realtime(second_task) || |
107 | 107 | ||
108 | /* is the deadline of the first task earlier? | 108 | /* is the deadline of the first task earlier? |
@@ -134,7 +134,7 @@ int edf_max_heap_order(struct binheap_node *a, struct binheap_node *b) | |||
134 | { | 134 | { |
135 | struct nested_info *l_a = (struct nested_info *)binheap_entry(a, struct nested_info, hp_binheap_node); | 135 | struct nested_info *l_a = (struct nested_info *)binheap_entry(a, struct nested_info, hp_binheap_node); |
136 | struct nested_info *l_b = (struct nested_info *)binheap_entry(b, struct nested_info, hp_binheap_node); | 136 | struct nested_info *l_b = (struct nested_info *)binheap_entry(b, struct nested_info, hp_binheap_node); |
137 | 137 | ||
138 | return __edf_higher_prio(l_a->hp_waiter_eff_prio, EFFECTIVE, l_b->hp_waiter_eff_prio, EFFECTIVE); | 138 | return __edf_higher_prio(l_a->hp_waiter_eff_prio, EFFECTIVE, l_b->hp_waiter_eff_prio, EFFECTIVE); |
139 | } | 139 | } |
140 | 140 | ||
@@ -147,7 +147,7 @@ int edf_max_heap_base_priority_order(struct binheap_node *a, struct binheap_node | |||
147 | { | 147 | { |
148 | struct nested_info *l_a = (struct nested_info *)binheap_entry(a, struct nested_info, hp_binheap_node); | 148 | struct nested_info *l_a = (struct nested_info *)binheap_entry(a, struct nested_info, hp_binheap_node); |
149 | struct nested_info *l_b = (struct nested_info *)binheap_entry(b, struct nested_info, hp_binheap_node); | 149 | struct nested_info *l_b = (struct nested_info *)binheap_entry(b, struct nested_info, hp_binheap_node); |
150 | 150 | ||
151 | return __edf_higher_prio(l_a->hp_waiter_eff_prio, BASE, l_b->hp_waiter_eff_prio, BASE); | 151 | return __edf_higher_prio(l_a->hp_waiter_eff_prio, BASE, l_b->hp_waiter_eff_prio, BASE); |
152 | } | 152 | } |
153 | 153 | ||