make bank_proc be more robust

1 files changed, 19 insertions, 11 deletions

diff --git a/litmus/bank_proc.c b/litmus/bank_proc.c
index 888b6a6542c5..e1025b5e4d7c 100644
--- a/litmus/bank_proc.c
+++ b/litmus/bank_proc.c
@@ -97,9 +97,10 @@ unsigned int counting_one_set(unsigned int v)
 //    unsigned int v; // count the number of bits set in v
     unsigned int c; // c accumulates the total bits set in v
 
-    for (c = 0; v; v >>= 1)
+    for (c = 0; v; v = v>>1)
     {
-        c += v & 1;
+        if(v&1)
+            c++;
     }
     return c;
 }
@@ -214,7 +215,7 @@ void add_page_to_color_list(struct page *page)
  */
 static int do_add_pages(void)
 {
-        printk("LITMUS do add pages\n");
+//      printk("LITMUS do add pages\n");
         
         struct page *page, *page_tmp;
         LIST_HEAD(free_later);
@@ -236,7 +237,7 @@ static int do_add_pages(void)
             //    page = alloc_pages_exact_node(0, GFP_HIGHUSER_MOVABLE, 0);
         
                 if (unlikely(!page)) {
-                        printk(KERN_WARNING "Could not allocate pages.\n");
+        //              printk(KERN_WARNING "Could not allocate pages.\n");
                         ret = -ENOMEM;
                         goto out;
                 }
@@ -271,7 +272,7 @@ static int do_add_pages(void)
                 }
                 */
         }
-        printk("page counter = \n");
+        /*printk("page counter = \n");
         for (i=0; i<128; i++)
         {
             printk("(%03d) = %4d, ", i , counter[i]);
@@ -280,6 +281,7 @@ static int do_add_pages(void)
             }
 
         }
+        */
         printk("After refill : \n");
         show_nr_pages();
 #if 1
@@ -357,18 +359,24 @@ struct page *new_alloc_page(struct page *page, unsigned long node, int **x)
         struct color_group *cgroup;
         struct page *rPage = NULL;
         unsigned int color;
-        
+        unsigned int randvalue;
+        get_random_bytes(&randvalue, sizeof(unsigned int));
+                
 
         unsigned int idx = 0;
-        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);
+//        printk("set = %lx, counting %d\n", set_partition[node],  counting_one_set(set_partition[node]));
+  //      printk("bank = %lx, counting %d\n", bank_partition[node],  counting_one_set(bank_partition[node]));
+        
+
+        idx += num_by_bitmask_index(set_partition[node], randvalue % counting_one_set(set_partition[node]));
+        idx += number_cachecolors* num_by_bitmask_index(bank_partition[node],randvalue % counting_one_set(bank_partition[node]) );
+//      printk("node  = %d, idx = %d\n", node, idx);
 
         rPage =  new_alloc_page_color(idx);
         
             
-        set_index[node] = (set_index[node]+1) % counting_one_set(set_partition[node]);
-        bank_index[node] = (bank_index[node]+1) % counting_one_set(bank_partition[node]);
+  //      set_index[node] = (set_index[node]+1) % counting_one_set(set_partition[node]);
+//        bank_index[node] = (bank_index[node]+1) % counting_one_set(bank_partition[node]);
         return rPage; 
 }