Fixes for C-FL-split

2 files changed, 17 insertions, 5 deletions

diff --git a/litmus/sanitizecfl.pl b/litmus/sanitizecfl.pl
new file mode 100755
index 000000000000..9b773878dca4
--- /dev/null
+++ b/litmus/sanitizecfl.pl
@@ -0,0 +1,12 @@
+#!/usr/bin/perl
+# A quick hack to allow diff to work between sched_gsn_edf.c and
+# sched_cfl_split.c
+open INFILE, "<sched_cedf.c";
+open OUTFILE, ">sched_cedf_namechange.c";
+while (my $line = <INFILE>){
+        $line =~ s/cedf/cflsplit/g;
+        $line =~ s/C-EDF/C-FL-split/g;
+        print OUTFILE $line;
+}
+close INFILE;
+close OUTFILE;
diff --git a/litmus/sched_cfl_split.c b/litmus/sched_cfl_split.c
index 6783b4c94366..ea5842c806e8 100644
--- a/litmus/sched_cfl_split.c
+++ b/litmus/sched_cfl_split.c
@@ -425,11 +425,11 @@ static void check_for_preemptions(cflsplit_domain_t *cluster)
                                                 &per_cpu(cflsplit_cpu_entries, task_cpu(task)));
                         if(affinity)
                                 last = affinity;
-                        else if(last->linked)
+                        else if(requeue_preempted_job(last->linked))
                                 requeue(last->linked);
                 }
 #else
-                if (last->linked)
+                if (requeue_preempted_job(last->linked))
                         requeue(last->linked);
 #endif
                 link_task_to_cpu(task, last);
@@ -611,7 +611,7 @@ static struct task_struct* cflsplit_schedule(struct task_struct * prev)
                 request_exit_np(entry->scheduled);
         }
         else if (np && needs_move) {
-                move_deadline(entry->scheduled);
+                request_exit_np(entry->scheduled);
         }
 
         /* Any task that is preemptable and either exhausts its execution
@@ -619,9 +619,9 @@ static struct task_struct* cflsplit_schedule(struct task_struct * prev)
          * this. Don't do a job completion if we block (can't have timers running
          * for blocked jobs). Preemption go first for the same reason.
          */
-        if (!np && (out_of_time || sleep) && !blocks && !preempt)
+        if (!np && (out_of_time || sleep) && !blocks)
                 job_completion(entry->scheduled, !sleep);
-        else if (!np && needs_move && !blocks && !preempt) {
+        else if (!np && needs_move && !blocks) {
                 move_deadline(entry->scheduled);
         }