diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2013-01-23 18:13:11 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2013-01-23 18:13:11 -0500 |
commit | 821a500d34ae6b2487a2ebecc6ab276fdfde0680 (patch) | |
tree | 0033c2a08bdf02116e97788627e0d2857ad05259 /litmus/sched_plugin.c | |
parent | 95717fa9f4b9f725928e898c42fb0e711e896311 (diff) |
Fix AUX tasks from being dropped by Litmus.
Diffstat (limited to 'litmus/sched_plugin.c')
-rw-r--r-- | litmus/sched_plugin.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/litmus/sched_plugin.c b/litmus/sched_plugin.c index 76ff892122aa..e1654da1ea6c 100644 --- a/litmus/sched_plugin.c +++ b/litmus/sched_plugin.c | |||
@@ -33,10 +33,10 @@ void preempt_if_preemptable(struct task_struct* t, int cpu) | |||
33 | 33 | ||
34 | TRACE_CUR("preempt_if_preemptable: %s/%d\n", | 34 | TRACE_CUR("preempt_if_preemptable: %s/%d\n", |
35 | (t) ? t->comm : "(nil)", | 35 | (t) ? t->comm : "(nil)", |
36 | (t) ? t->pid : 0); | 36 | (t) ? t->pid : -1); |
37 | 37 | ||
38 | if (!t) { | 38 | if (!t) { |
39 | TRACE_CUR("unconditionally reshcedule\n"); | 39 | TRACE_CUR("unconditionally reschedule\n"); |
40 | /* move non-real-time task out of the way */ | 40 | /* move non-real-time task out of the way */ |
41 | reschedule = 1; | 41 | reschedule = 1; |
42 | } | 42 | } |
@@ -229,7 +229,6 @@ static int litmus_dummy_map_gpu_to_cpu(int gpu) | |||
229 | } | 229 | } |
230 | #endif | 230 | #endif |
231 | 231 | ||
232 | |||
233 | /* The default scheduler plugin. It doesn't do anything and lets Linux do its | 232 | /* The default scheduler plugin. It doesn't do anything and lets Linux do its |
234 | * job. | 233 | * job. |
235 | */ | 234 | */ |
@@ -272,7 +271,6 @@ struct sched_plugin linux_sched_plugin = { | |||
272 | #if defined(CONFIG_LITMUS_NVIDIA) && defined(CONFIG_LITMUS_SOFTIRQD) | 271 | #if defined(CONFIG_LITMUS_NVIDIA) && defined(CONFIG_LITMUS_SOFTIRQD) |
273 | .map_gpu_to_cpu = litmus_dummy_map_gpu_to_cpu, | 272 | .map_gpu_to_cpu = litmus_dummy_map_gpu_to_cpu, |
274 | #endif | 273 | #endif |
275 | |||
276 | .admit_task = litmus_dummy_admit_task | 274 | .admit_task = litmus_dummy_admit_task |
277 | }; | 275 | }; |
278 | 276 | ||
@@ -335,7 +333,6 @@ int register_sched_plugin(struct sched_plugin* plugin) | |||
335 | #if defined(CONFIG_LITMUS_NVIDIA) && defined(CONFIG_LITMUS_SOFTIRQD) | 333 | #if defined(CONFIG_LITMUS_NVIDIA) && defined(CONFIG_LITMUS_SOFTIRQD) |
336 | CHECK(map_gpu_to_cpu); | 334 | CHECK(map_gpu_to_cpu); |
337 | #endif | 335 | #endif |
338 | |||
339 | CHECK(admit_task); | 336 | CHECK(admit_task); |
340 | 337 | ||
341 | if (!plugin->release_at) | 338 | if (!plugin->release_at) |