Color Queue: track the units of work done by each task.

4 files changed, 20 insertions, 18 deletions

diff --git a/include/litmus/color.h b/include/litmus/color.h
index 50f1f7399e70..2f7e19cd4602 100644
--- a/include/litmus/color.h
+++ b/include/litmus/color.h
@@ -83,8 +83,8 @@ int color_nr_pages_handler(struct ctl_table *, int, void __user *,
 int color_reclaim_pages_handler(struct ctl_table *, int, void __user *,
                 size_t *, loff_t *);
 
-void color_sched_in_task(struct task_struct*);
-void color_sched_out_task(struct task_struct*);
+int color_sched_in_task(struct task_struct*);
+int color_sched_out_task(struct task_struct*);
 
 #ifdef CONFIG_LOCKDEP
 #define LITMUS_LOCKDEP_NAME_MAX_LEN 50
diff --git a/include/litmus/color_queue.h b/include/litmus/color_queue.h
index 62d862c3e2b0..95dd395c0b9c 100644
--- a/include/litmus/color_queue.h
+++ b/include/litmus/color_queue.h
@@ -55,8 +55,8 @@ struct color_queue_request {
 int setup_flusher_array(void);
 
 /* See comments in C file! */
-void color_queue_enqueue_read(struct task_struct *ts);
-void color_queue_enqueue_flush(struct task_struct *ts);
+int color_queue_enqueue_read(struct task_struct *ts);
+int color_queue_enqueue_flush(struct task_struct *ts);
 
 void cleanup_color_page_infos(struct list_head *head);
 
diff --git a/litmus/color.c b/litmus/color.c
index 2ba67f1dc06f..26f800e785ae 100644
--- a/litmus/color.c
+++ b/litmus/color.c
@@ -219,19 +219,19 @@ void reclaim_pages(struct vm_area_struct *vma)
 /*
  * Does way assignment and page read in.
  */
-void color_sched_in_task(struct task_struct *t)
+int color_sched_in_task(struct task_struct *t)
 {
         color_page_info_take_ways(t);
-        color_queue_enqueue_read(t);
+        return color_queue_enqueue_read(t);
 }
 
 /*
  * Does way give-back and page flush.
  */
-void color_sched_out_task(struct task_struct *t)
+int color_sched_out_task(struct task_struct *t)
 {
         color_page_info_release_ways(t);
-        color_queue_enqueue_flush(t);
+        return color_queue_enqueue_flush(t);
 }
 
 asmlinkage long sys_set_color_page_info(struct color_ctrl_page __user *user_color_ctrl)
diff --git a/litmus/color_queue.c b/litmus/color_queue.c
index 78177572da51..b4a081c91be6 100644
--- a/litmus/color_queue.c
+++ b/litmus/color_queue.c
@@ -115,7 +115,7 @@ static void color_page_info_add_work(struct color_page_info *info, void *vaddr_s
         }
 }
 
-static void color_queue_submit_work(void);
+static int color_queue_submit_work(void);
 
 /*
  * Assumes this is called on the CPU that @ts ran on and that this CPU that is
@@ -123,7 +123,7 @@ static void color_queue_submit_work(void);
  *
  * Also assumes that @way set for each color_page_info before calling!
  */
-void color_queue_enqueue_read(struct task_struct *ts)
+int color_queue_enqueue_read(struct task_struct *ts)
 {
         struct color_page_info *cur_info;
 
@@ -141,7 +141,7 @@ void color_queue_enqueue_read(struct task_struct *ts)
                 color_page_info_add_work(cur_info, vaddr_start);
         }
 
-        color_queue_submit_work();
+        return color_queue_submit_work();
 }
 
 /*
@@ -151,7 +151,7 @@ void color_queue_enqueue_read(struct task_struct *ts)
  * Also assumes that @way is still set to the way this page was read into to
  * find the proper address to flush.
  */
-void color_queue_enqueue_flush(struct task_struct *ts)
+int color_queue_enqueue_flush(struct task_struct *ts)
 {
         struct color_page_info *cur_info;
 
@@ -165,7 +165,7 @@ void color_queue_enqueue_flush(struct task_struct *ts)
                 color_page_info_add_work(cur_info, vaddr_start);
         }
 
-        color_queue_submit_work();
+        return color_queue_submit_work();
 }
 
 static void do_work_read(struct color_queue_request *request)
@@ -264,11 +264,11 @@ static void wait_next_phase(void)
         }
 }
 
-static void color_queue_loop(void)
+static int color_queue_loop(void)
 {
         struct cpu_entry *entry = &__get_cpu_var(cpu_entries);
         struct color_queue_request *request;
-        int nr_work;
+        int nr_work, nr_work_done_by_task = 0;
 
         for (;;) {
                 raw_spin_lock(&entry->lock);
@@ -307,6 +307,7 @@ static void color_queue_loop(void)
                         QTRACE(color_queue, "found a piece of work to do: %p\n", request);
                         raw_spin_unlock(&color_queue.lock);
                         do_work_son(request);
+                        ++nr_work_done_by_task;
                 } else {
                         /* we need to wait for the next phase */
                         color_queue.at_barrier++;
@@ -315,16 +316,17 @@ static void color_queue_loop(void)
                         wait_next_phase();
                 }
         }
+
+        return nr_work_done_by_task;
 }
 
 /*
  * Actually enqueues the work on the color queue and enters the work loop.
  */
-static void color_queue_submit_work(void)
+static int color_queue_submit_work(void)
 {
         struct cpu_entry *entry = &__get_cpu_var(cpu_entries);
 
-
         raw_spin_lock(&color_queue.lock);
         QTRACE(color_queue, "start submit work\n");
         entry->phase = color_queue.phase;
@@ -332,7 +334,7 @@ static void color_queue_submit_work(void)
         list_splice_tail_init(&entry->enqueue, &color_queue.queue);
         QTRACE(color_queue, "end submit work\n");
         raw_spin_unlock(&color_queue.lock);
-        color_queue_loop();
+        return color_queue_loop();
 }
 
 void cleanup_color_page_infos(struct list_head *head)