cleanup for posting

3 files changed, 8 insertions, 24 deletions

diff --git a/litmus/bank_proc.c b/litmus/bank_proc.c
index 55f0f70476f1..67a5e71c0da7 100644
--- a/litmus/bank_proc.c
+++ b/litmus/bank_proc.c
@@ -218,8 +218,6 @@ void add_page_to_color_list(struct page *page)
  */
 static int do_add_pages(void)
 {
-        //printk("LITMUS do add pages\n");
-        
         struct page *page, *page_tmp;
         LIST_HEAD(free_later);
         unsigned long color;
@@ -228,16 +226,11 @@ static int do_add_pages(void)
         int free_counter = 0;
         unsigned long counter[128]= {0}; 
         
-        //printk("Before refill : \n");
-        //show_nr_pages();
-
         // until all the page lists contain enough pages 
-        //for (i =0; i<5; i++) {
         for (i=0; i< 1024*50;i++) {
         //while (smallest_nr_pages() < PAGES_PER_COLOR) {
        //         printk("smallest = %d\n", smallest_nr_pages());       
                 page = alloc_page(GFP_HIGHUSER_MOVABLE);
-            //    page = alloc_pages_exact_node(0, GFP_HIGHUSER_MOVABLE, 0);
         
                 if (unlikely(!page)) {
                         printk(KERN_WARNING "Could not allocate pages.\n");
@@ -305,7 +298,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)
 {
 //      printk("allocate new page color = %d\n", color);        
         struct color_group *cgroup;
@@ -369,15 +362,15 @@ struct page *new_alloc_page(struct page *page, unsigned long node, int **x)
         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]);
+    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]);
+    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>=64)
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 4f7c6450b464..129f74740480 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -477,11 +477,10 @@ asmlinkage long sys_set_page_color(int cpu)
         TRACE_TASK(current, "nr_pages = %d nr_failed = %d\n", nr_pages, nr_failed);
         printk(KERN_INFO "node = %ld, nr_migrated_pages = %d, nr_shared_pages = %d, nr_failed = %d\n", node, nr_pages-nr_not_migrated, nr_failed-2, nr_failed);
         //printk(KERN_INFO "node = %d\n", cpu_to_node(smp_processor_id()));
-        //flush_cache(1);
         return ret;
 }
 
-/* sys_test_call() is a test system call for developing */
+/* sys_test_call() is a test system call for debugging */
 asmlinkage long sys_test_call(unsigned int param)
 {
         long ret = 0;
@@ -521,7 +520,6 @@ asmlinkage long sys_test_call(unsigned int param)
         }
         else if (param == 1) {
                 int i;
-                //flush_cache(1);
                 for (i = 0; i < 4; i++) {
                         lock_cache(i, 0x00003fff);
                 }
diff --git a/litmus/sched_mc2.c b/litmus/sched_mc2.c
index 21c616f9c9ba..aa3d999d60ed 100644
--- a/litmus/sched_mc2.c
+++ b/litmus/sched_mc2.c
@@ -134,10 +134,8 @@ asmlinkage long sys_enact_mode(void)
         struct reservation *res;
         struct list_head *pos;
         unsigned long flags;
-        //lt_t now = litmus_clock();
         TRACE_TASK(current, "ENACTING SYSCALL\n");
         if (state->cpu == 0){
-                //preempt_disable();
                 mode_changed = false;
                 local_irq_save(flags);
                 if (pending){ //MCR has entered 
@@ -148,7 +146,6 @@ asmlinkage long sys_enact_mode(void)
                         if (!seen_once){
                                 TRACE_TASK(current, "REQUEST\n");
                                 sched_trace_request_mode(current);
-                                //TS_MODE_CHANGE_START;
                                 //clean up jobs that are already done
                                 //after this jobs report themselves
                                 list_for_each(pos, &_global_env->active_reservations){
@@ -172,7 +169,7 @@ asmlinkage long sys_enact_mode(void)
                                         res = list_entry(pos, struct reservation, list);
                                         if (tsk_rt(res->tsk)->completed && res->mode == mode && !res->reported){
                                                 res->reported = 1;
-                                                //TRACE_CUR("R%d RES_REPORTED_INACTIVE = %d mode %d\n", res->id, res_reported, res->mode);
+                                                TRACE_CUR("R%d RES_REPORTED_INACTIVE = %d mode %d\n", res->id, res_reported, res->mode);
                                                 res_reported--;
                                         }
                                 }
@@ -220,9 +217,7 @@ asmlinkage long sys_enact_mode(void)
                                 }
                                 sup_update_time(state->sup_env, litmus_clock());
                                 //raw_spin_unlock(&state->lock);
-                                //t=litmus_clock();
                                 sched_trace_enact_mode(current);
-                                //TS_MODE_CHANGE_END;
                                 TRACE("ENACT\n");
                         }
                         raw_spin_unlock(&mode_lock);
@@ -259,7 +254,6 @@ asmlinkage long sys_enact_mode(void)
                         //TRACE("CPU%d mode changed\n",state->cpu);
                         hrtimer_cancel(&state->timer); //stop listening to old mode timers
                         TRACE("Timer is cancelled at %llu. mode-change\n", litmus_clock());
-                        //preempt_disable();
                         //local_irq_save(flags);
                         raw_spin_lock(&state->lock);
                         state->sup_env = &state->sup_env_modes[mode];
@@ -280,7 +274,6 @@ asmlinkage long sys_enact_mode(void)
                         mc2_update_timer_and_unlock(state);
                         //local_irq_restore(flags);
         
-                        //preempt_enable();
                 }
                 this_cpu_write(mode_counter, *cpu0_counter);
                 local_irq_restore(flags);