8 files changed, 53 insertions, 512 deletions

diff --git a/litmus/bank_proc.c b/litmus/bank_proc.c
index df9f5730ed05..2284f4fd5816 100644
--- a/litmus/bank_proc.c
+++ b/litmus/bank_proc.c
@@ -247,8 +247,8 @@ static int do_add_pages(void)
                 counter[color]++;
         //      printk("page(%d) = color %x, bank %x, [color] =%d \n", color, page_color(page), page_bank(page), atomic_read(&color_groups[color].nr_pages));
                 //show_nr_pages();
-                //if (atomic_read(&color_groups[color].nr_pages) < PAGES_PER_COLOR && color>=32) {
-                if (atomic_read(&color_groups[color].nr_pages) < PAGES_PER_COLOR) {
+                if (atomic_read(&color_groups[color].nr_pages) < PAGES_PER_COLOR && color>=32) {
+                //if (atomic_read(&color_groups[color].nr_pages) < PAGES_PER_COLOR) {
                 //if ( PAGES_PER_COLOR && color>=16*2) {
                         add_page_to_color_list(page);
         //              printk("add page(%d) = color %x, bank %x\n", color, page_color(page), page_bank(page));
@@ -304,7 +304,7 @@ out:
  * This function should not be accessed by others directly. 
  * 
  */ 
-static struct  page *new_alloc_page_color( unsigned long color)
+static struct  page *new_alloc_page_color( unsigned long color, int do_refill)
 {
 //      printk("allocate new page color = %d\n", color);        
         struct color_group *cgroup;
@@ -333,18 +333,19 @@ static struct  page *new_alloc_page_color( unsigned long color)
 out_unlock:
         spin_unlock(&cgroup->lock);
 out:
-        if( smallest_nr_pages() == 0)
+        if( smallest_nr_pages() == 0 && do_refill == 1)
         {
                 do_add_pages();
        //     printk("ERROR(bank_proc.c) = We don't have enough pages in bank_proc.c\n");        
         
         }
+                
         return rPage;
 }
 
 struct page* get_colored_page(unsigned long color)
 {
-        return new_alloc_page_color(color);
+        return new_alloc_page_color(color, 1);
 }
 
 /*
@@ -368,12 +369,12 @@ struct page *new_alloc_page(struct page *page, unsigned long node, int **x)
         unsigned int color;
         
 
-        unsigned int idx = 0;
+    unsigned int idx = 0;
+        do {
         idx += num_by_bitmask_index(set_partition[node], set_index[node]);
         idx += number_cachecolors* num_by_bitmask_index(bank_partition[node], bank_index[node]);
-        //printk("node  = %d, idx = %d\n", node, idx);
-
-        rPage =  new_alloc_page_color(idx);
+                rPage =  new_alloc_page_color(idx, 0);
+        } while (rPage == NULL);
         
             
         set_index[node] = (set_index[node]+1) % counting_one_set(set_partition[node]);
diff --git a/litmus/cache_proc.c b/litmus/cache_proc.c
index 87077d4366dc..15c1b0145be2 100644
--- a/litmus/cache_proc.c
+++ b/litmus/cache_proc.c
@@ -1006,59 +1006,9 @@ int setup_flusher_array(void)
                 }

 

                 flusher_pages[way] = flusher_color_arr;

-                /* This is ugly. */

                 for (color = 0; color < MAX_NR_COLORS; color++) {

                         int node;

-                        switch (color) {

-                                case 0:

-                                        node = 48;

-                                        break;

-                                case 1:

-                                        node = 49;

-                                        break;

-                                case 2:

-                                        node = 50;

-                                        break;

-                                case 3:

-                                        node = 51;

-                                        break;

-                                case 4:

-                                        node = 68;

-                                        break;

-                                case 5:

-                                        node = 69;

-                                        break;

-                                case 6:

-                                        node = 86;

-                                        break;

-                                case 7:

-                                        node = 87;

-                                        break;

-                                case 8:

-                                        node = 88;

-                                        break;

-                                case 9:

-                                        node = 105;

-                                        break;

-                                case 10:

-                                        node = 106;

-                                        break;

-                                case 11:

-                                        node = 107;

-                                        break;

-                                case 12:

-                                        node = 108;

-                                        break;                                  

-                                case 13:

-                                        node = 125;

-                                        break;

-                                case 14:

-                                        node = 126;

-                                        break;

-                                case 15:

-                                        node = 127;

-                                        break;

-                        }       

+                        node = color + 112; // populate from bank 7

                         page = get_colored_page(node);

                         if (!page) {

                                 printk(KERN_WARNING "no more colored pages\n");

diff --git a/litmus/litmus.c b/litmus/litmus.c
index 1f5e49114b2c..7fbabcee64d5 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -385,7 +385,7 @@ asmlinkage long sys_set_page_color(int cpu)
         put_task_struct(current);
 
         down_read(&mm->mmap_sem);
-        TRACE_TASK(current, "SYSCALL set_page_color\n");
+
         vma_itr = mm->mmap;
         /* Iterate all vm_area_struct */
         while (vma_itr != NULL) {
@@ -439,10 +439,6 @@ asmlinkage long sys_set_page_color(int cpu)
                                                 lib_page->r_pfn[cpu_i] = INVALID_PFN;
                                         }
                                         list_add_tail(&lib_page->list, &shared_lib_pages);
-                                        TRACE_TASK(current, "NEW PAGE %05lx ADDED.\n", lib_page->master_pfn);
-                                }
-                                else {
-                                        TRACE_TASK(current, "FOUND PAGE %05lx in the list.\n", lib_page->master_pfn);
                                 }
                                 
                                 /* add to task_shared_pagelist */
@@ -475,15 +471,11 @@ asmlinkage long sys_set_page_color(int cpu)
         }
         
         ret = 0;
-        if (!is_realtime(current))
+        lv = tsk_rt(current)->mc2_data->crit;
+        if (cpu == -1)
                 node = 8;
-        else {
-                lv = tsk_rt(current)->mc2_data->crit;
-                if (cpu == -1)
-                        node = 8;
-                else
-                        node = cpu*2 + lv;
-        }
+        else
+                node = cpu*2 + lv;
 
         /* Migrate private pages */
         if (!list_empty(&pagelist)) {
@@ -511,60 +503,11 @@ asmlinkage long sys_set_page_color(int cpu)