code cleanup

3 files changed, 3 insertions, 45 deletions

diff --git a/litmus/bank_proc.c b/litmus/bank_proc.c
index bd1fb961436f..08b58f94c391 100644
--- a/litmus/bank_proc.c
+++ b/litmus/bank_proc.c
@@ -145,6 +145,7 @@ unsigned int num_by_bitmask_index(unsigned int bitmask, unsigned int index)
     return pos;
 }
 
+/* helper functions to find the next colored pool index */
 static inline unsigned int first_index(unsigned long node)
 {
         unsigned int bank_no = 0, color_no = 0;
@@ -227,7 +228,7 @@ static inline unsigned int next_bank(unsigned long node, unsigned int current_ba
 static inline unsigned int get_next_index(unsigned long node, unsigned int current_index)
 {
         unsigned int bank_no, color_no, color_ret, bank_ret;
-        bank_no = current_index>>4;
+        bank_no = current_index>>4; // 2^4 = 16 colors
         color_no = current_index - bank_no*NUM_COLORS;
         bank_ret = bank_no;
         color_ret = next_color(node, color_no);
@@ -455,37 +456,10 @@ struct page* get_colored_page(unsigned long color)
  */
 struct page *new_alloc_page(struct page *page, unsigned long node, int **x)
 {
-//      printk("allocate new page node = %d\n", node);  
-//      return alloc_pages_exact_node(node, GFP_HIGHUSER_MOVABLE, 0);
         struct color_group *cgroup;
         struct page *rPage = NULL;
         unsigned int color;
         int try = 0;
-        
-        
-/*
-    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);
-
-        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]);
-        while (!rPage)  {
-                try++;
-                if (try>=256)
-                        break;
-                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(KERN_ALERT "out of page! requesting 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]);
-        }
-*/  
         unsigned int idx;
         
         if (node_index[node] == -1)
@@ -507,7 +481,7 @@ struct page *new_alloc_page(struct page *page, unsigned long node, int **x)
                 idx = get_next_index(node, idx);
                 printk(KERN_ALERT "try = %d out of page! requesting node  = %d, idx = %d\n", try, node, idx);
                 BUG_ON(idx<0 || idx>127);
-                rPage =  new_alloc_page_color(idx);
+                rPage = new_alloc_page_color(idx);
         }
         node_index[node] = idx;
         return rPage; 
diff --git a/litmus/jobs.c b/litmus/jobs.c
index 898c09335b9f..59c29d517074 100644
--- a/litmus/jobs.c
+++ b/litmus/jobs.c
@@ -39,14 +39,6 @@ void prepare_for_next_period(struct task_struct *t)
                            tsk_rt(t)->sporadic_release_time + INIT_PHASE_LENGTH_NS*(tsk_rt(t)->job_params.job_no));
                 /* sporadic release */
                 setup_release(t, tsk_rt(t)->sporadic_release_time + INIT_PHASE_LENGTH_NS*(tsk_rt(t)->job_params.job_no));
-/*              if (num_sync_released == 0) {
-                        tsk_rt(t)->sporadic_release = 0;
-                        TRACE("num_sync_released is 0\n");
-                }
-*/              
-//      } else if (num_sync_released > 0) {
-//              TRACE_TASK(t, "num_sync_released = %d and job_no = %d\n", num_sync_released, tsk_rt(t)->job_params.job_no);
-//              setup_release(t, tsk_rt(t)->sporadic_release_time + INIT_PHASE_LENGTH_NS*(tsk_rt(t)->job_params.job_no));
         } else {
                 /* periodic release => add period */
                 setup_release(t, get_release(t) + get_rt_period(t));
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 554002d8b9a8..90e21eeadabb 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -430,19 +430,11 @@ asmlinkage long sys_set_page_color(int cpu)
                 vma_itr = vma_itr->vm_next;
         }
 
-        //list_for_each_entry(page_itr, &pagelist, lru) {
-//              printk(KERN_INFO "B _mapcount = %d, _count = %d\n", page_mapcount(page_itr), page_count(page_itr));
-//      }
-        
         ret = 0;
-        //if (!is_realtime(current))
-//              lv = 1;
-//      else {
         if (tsk_rt(current)->mc2_data)
                 lv = tsk_rt(current)->mc2_data->crit;
         else
                 BUG();//lv = 0;
-//      }
         
         if (cpu == -1)
                 node = 8;