Differentiate between PERIODIC and SPORADIC tasks.

Tasks can now be PERIODIC or SPORADIC.

PERIODIC tasks do not have their job number incremented
when they wake up and are tardy. PERIODIC jobs must
end with a call to sys_complete_job() to set up their next
release. (Not currently supported by pfair.)

SPORADIC tasks _do_ have their job number incremented when
they wake up and are tardy. SPORADIC is the default task
behavior, carrying forward Litmus's current behavior.

5 files changed, 10 insertions, 10 deletions

diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index ba3ed4525421..6e1327bbf504 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -254,7 +254,7 @@ static noinline void requeue(struct task_struct* task)
         /* sanity check before insertion */
         BUG_ON(is_queued(task));
 
-        if (wants_early_release(task) || is_released(task, litmus_clock()))
+        if (is_early_releasing(task) || is_released(task, litmus_clock()))
                 __add_ready(&cluster->domain, task);
         else {
                 /* it has got to wait */
@@ -353,7 +353,7 @@ static noinline void job_completion(struct task_struct *t, int forced)
         tsk_rt(t)->completed = 1;
         /* prepare for next period */
         prepare_for_next_period(t);
-        if (wants_early_release(t) || is_released(t, litmus_clock()))
+        if (is_early_releasing(t) || is_released(t, litmus_clock()))
                 sched_trace_task_release(t);
         /* unlink */
         unlink(t);
@@ -596,7 +596,7 @@ static void cedf_task_wake_up(struct task_struct *task)
 
         raw_spin_lock_irqsave(&cluster->cluster_lock, flags);
         now = litmus_clock();
-        if (is_tardy(task, now)) {
+        if (is_sporadic(task) && is_tardy(task, now)) {
                 /* new sporadic release */
                 release_at(task, now);
                 sched_trace_task_release(task);
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index ac5c4d836018..5956978ccdbe 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -251,7 +251,7 @@ static noinline void requeue(struct task_struct* task)
         /* sanity check before insertion */
         BUG_ON(is_queued(task));
 
-        if (wants_early_release(task) || is_released(task, litmus_clock()))
+        if (is_early_releasing(task) || is_released(task, litmus_clock()))
                 __add_ready(&gsnedf, task);
         else {
                 /* it has got to wait */
@@ -344,7 +344,7 @@ static noinline void job_completion(struct task_struct *t, int forced)
         tsk_rt(t)->completed = 1;
         /* prepare for next period */
         prepare_for_next_period(t);
-        if (wants_early_release(t) || is_released(t, litmus_clock()))
+        if (is_early_releasing(t) || is_released(t, litmus_clock()))
                 sched_trace_task_release(t);
         /* unlink */
         unlink(t);
@@ -578,7 +578,7 @@ static void gsnedf_task_wake_up(struct task_struct *task)
 
         raw_spin_lock_irqsave(&gsnedf_lock, flags);
         now = litmus_clock();
-        if (is_tardy(task, now)) {
+        if (is_sporadic(task) && is_tardy(task, now)) {
                 /* new sporadic release */
                 release_at(task, now);
                 sched_trace_task_release(task);
diff --git a/litmus/sched_pfair.c b/litmus/sched_pfair.c
index 6a89b003306c..d5fb3a832adc 100644
--- a/litmus/sched_pfair.c
+++ b/litmus/sched_pfair.c
@@ -710,7 +710,7 @@ static void pfair_task_wake_up(struct task_struct *t)
          */
         requeue = tsk_rt(t)->flags == RT_F_REQUEUE;
         now = litmus_clock();
-        if (lt_before(get_deadline(t), now)) {
+        if (is_tardy(t, now)) {
                 TRACE_TASK(t, "sporadic release!\n");
                 release_at(t, now);
                 prepare_release(t, time2quanta(now, CEIL));
diff --git a/litmus/sched_pfp.c b/litmus/sched_pfp.c
index fc9a509f185d..aade09044917 100644
--- a/litmus/sched_pfp.c
+++ b/litmus/sched_pfp.c
@@ -343,7 +343,7 @@ static void pfp_task_wake_up(struct task_struct *task)
         BUG_ON(is_queued(task));
 #endif
         now = litmus_clock();
-        if (is_tardy(task, now)
+        if (is_sporadic(task) && is_tardy(task, now)
 #ifdef CONFIG_LITMUS_LOCKING
         /* We need to take suspensions because of semaphores into
          * account! If a job resumes after being suspended due to acquiring
diff --git a/litmus/sched_psn_edf.c b/litmus/sched_psn_edf.c
index 316333460dd9..65c85a3a4c64 100644
--- a/litmus/sched_psn_edf.c
+++ b/litmus/sched_psn_edf.c
@@ -61,7 +61,7 @@ static void requeue(struct task_struct* t, rt_domain_t *edf)
                 TRACE_TASK(t, "requeue: !TASK_RUNNING\n");
 
         tsk_rt(t)->completed = 0;
-        if (wants_early_release(t) || is_released(t, litmus_clock()))
+        if (is_early_releasing(t) || is_released(t, litmus_clock()))
                 __add_ready(edf, t);
         else
                 add_release(edf, t); /* it has got to wait */
@@ -320,7 +320,7 @@ static void psnedf_task_wake_up(struct task_struct *task)
         raw_spin_lock_irqsave(&pedf->slock, flags);
         BUG_ON(is_queued(task));
         now = litmus_clock();
-        if (is_tardy(task, now)
+        if (is_sporadic(task) && is_tardy(task, now)
 #ifdef CONFIG_LITMUS_LOCKING
         /* We need to take suspensions because of semaphores into
          * account! If a job resumes after being suspended due to acquiring