Checkpoint: almost all support added. Compiles.

1 files changed, 18 insertions, 14 deletions

diff --git a/kernel/litmus.c b/kernel/litmus.c
index dbeca929a7..a5c256505d 100644
--- a/kernel/litmus.c
+++ b/kernel/litmus.c
@@ -290,25 +290,29 @@ asmlinkage int sys_scheduler_setup(int cmd, void __user *parameter)
  * Based on the current time, are we in the blocking zone? If so,
  * return one, otherwise zero.
  */
-#define ZONE_SIZE       10      /* size of blocking zone, in us */
 asmlinkage int sys_in_blocking_zone(void)
 {
-        struct timeval current_time;
-        int quantum_start_time;
-                /* quantum_start_time =
-                * Time of last quantum boundary = Time of last local timer intr */
-        int zone_size = ZONE_SIZE;
+        struct timeval current_time, zone_start_time;
+        suseconds_t quantum_length, zone_size;
+
+        /* get quantum length and zone size */  
+        quantum_length = (suseconds_t)jiffies_to_usecs(1);
+        zone_size = (suseconds_t)ZONE_SIZE; /* could modify if desired */
         
-        /* Assuming us granularity... */
-        int quantum_length = jiffies_to_usecs(1);
+        /* calculate starting time of zone */
+        zone_start_time.tv_sec = per_cpu(last_local_intr, cpu).tv_sec;
+        zone_start_time.tv_usec = per_cpu(last_local_intr, cpu).tv_usec;
+        timeval_add_usecs(&zone_start_time, quantum_length);
+        timeval_sub_usecs(&zone_start_time, zone_size);
+
+        /* get current time */
         do_gettimeofday(&current_time);
-        /* Is current_time > quantum_start_time+quantum_length-zone_size? */
-        /* yes */ return 1;
-        /* no  */ return 0;
-        /* try to use timeval compare, get everything in that format. */
-        /* timeval_to_ns? ns_to_timeval? */
 
-        return 0; // FIXME: perform "real" check.
+        /* check if we are in the blocking zone */
+        if (timeval_compare(current_time, zone_start_time) == 1)
+                return 1;
+        else
+                return 0;
 }
 
 /*