diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2010-11-26 15:54:28 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2010-11-26 15:54:46 -0500 |
commit | fcdaecd7621fb9debb8595eb827198c2a97a7b4f (patch) | |
tree | 641a24df001c06bd12453d06d41b5b4a2f28801e | |
parent | a58179081abb08862bef0d2fa9f3dc90ac89a74d (diff) | |
parent | 7977e72044255ac35bd5cc53f208d2a2fb85d960 (diff) |
Merge branch 'wip-edzl-revised' into wip-aedzl-revised
-rw-r--r-- | litmus/sched_edzl.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/litmus/sched_edzl.c b/litmus/sched_edzl.c index c1c98fd20b64..768567f6dfdc 100644 --- a/litmus/sched_edzl.c +++ b/litmus/sched_edzl.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * litmus/sched_gsn_edf.c | 2 | * litmus/sched_edzl.c |
3 | * | 3 | * |
4 | * Implementation of the GSN-EDF scheduling algorithm. | 4 | * Implementation of the EDZL scheduling algorithm. |
5 | * | 5 | * |
6 | * This version uses the simple approach and serializes all scheduling | 6 | * This version uses the simple approach and serializes all scheduling |
7 | * decisions by the use of a queue lock. This is probably not the | 7 | * decisions by the use of a queue lock. This is probably not the |
@@ -23,11 +23,7 @@ | |||
23 | 23 | ||
24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
25 | 25 | ||
26 | /* Overview of GSN-EDF operations. | 26 | /* Overview of EDZL operations. |
27 | * | ||
28 | * For a detailed explanation of GSN-EDF have a look at the FMLP paper. This | ||
29 | * description only covers how the individual operations are implemented in | ||
30 | * LITMUS. | ||
31 | * | 27 | * |
32 | * link_task_to_cpu(T, cpu) - Low-level operation to update the linkage | 28 | * link_task_to_cpu(T, cpu) - Low-level operation to update the linkage |
33 | * structure (NOT the actually scheduled | 29 | * structure (NOT the actually scheduled |
@@ -401,7 +397,7 @@ static void preempt(cpu_entry_t *entry) | |||
401 | preempt_if_preemptable(entry->scheduled, entry->cpu); | 397 | preempt_if_preemptable(entry->scheduled, entry->cpu); |
402 | } | 398 | } |
403 | 399 | ||
404 | /* requeue - Put an unlinked task into gsn-edf domain. | 400 | /* requeue - Put an unlinked task into edzl domain. |
405 | * Caller must hold edzl_lock. | 401 | * Caller must hold edzl_lock. |
406 | */ | 402 | */ |
407 | static noinline void requeue(struct task_struct* task) | 403 | static noinline void requeue(struct task_struct* task) |