Merge branch 'master' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/litmus2010

1 files changed, 19 insertions, 2 deletions

diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index f37d5f67a308..d0767ce9e178 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -112,6 +112,8 @@ cpu_entry_t* *cedf_cpu_entries_array;
  */
 int cluster_size = 4;
 
+int do_cleanup = 1;
+
 typedef struct {
         rt_domain_t             domain;
         int                     first_cpu;
@@ -667,6 +669,19 @@ static int __init init_cedf(void)
         int cpu;
         cpu_entry_t *entry;
 
+        /* num_online_cpus() should have been set already
+         * if the number of available cpus is less then the cluster
+         * size (currently 4) then it is pointless trying to use
+         * CEDF, so we disable this plugin
+         */
+        if(num_online_cpus() < cluster_size) {
+                printk(KERN_INFO "Not registering C-EDF plugin: "
+                        "Num Online Cpus (%d) < Min Cluster Size (%d)\n",
+                        num_online_cpus(), cluster_size);
+                do_cleanup = 0;
+                return 0;
+        }
+
         /*
          * initialize short_cut for per-cpu cedf state;
          * there may be a problem here if someone removes a cpu
@@ -701,8 +716,10 @@ static int __init init_cedf(void)
 
 static void clean_cedf(void)
 {
-        kfree(cedf_cpu_entries_array);
-        kfree(cedf_domains_array);
+        if(do_cleanup) {
+                kfree(cedf_cpu_entries_array);
+                kfree(cedf_domains_array);
+        }
 }
 
 module_init(init_cedf);