From 597fe6258a04315fec2090c8233240810002136c Mon Sep 17 00:00:00 2001
From: Shaun Ren <shaun.ren@linux.com>
Date: Fri, 8 Nov 2013 17:26:06 -0500
Subject: [PATCH 1/2] isolate now uses setitimer

---
 isolate.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/isolate.c b/isolate.c
index e253a33..0a11cb6 100644
--- a/isolate.c
+++ b/isolate.c
@@ -86,6 +86,17 @@ static void chowntree(char *path, uid_t uid, gid_t gid);
 
 static FILE *metafile;
 
+static int
+set_timer(int msec)
+{
+  struct itimerval new, old;
+  new.it_interval.tv_usec = 0;
+  new.it_interval.tv_sec = 0;
+  new.it_value.tv_usec = (msec%1000) * 1000;
+  new.it_value.tv_sec = msec/1000;
+  return setitimer(ITIMER_REAL, &new, &old);
+}
+
 static void
 meta_open(const char *name)
 {
@@ -975,7 +986,6 @@ signal_alarm(int unused UNUSED)
 {
   /* Time limit checks are synchronous, so we only schedule them there. */
   timer_tick = 1;
-  alarm(1);
 }
 
 static void
@@ -1054,9 +1064,11 @@ get_run_time_ms(struct rusage *rus)
 static void
 check_timeout(void)
 {
+  int timer_time = -1000;
   if (wall_timeout)
     {
       int wall_ms = get_wall_time_ms();
+      timer_time = wall_timeout - wall_ms;
       if (wall_ms > wall_timeout)
         err("TO: Time limit exceeded (wall clock)");
       if (verbose > 1)
@@ -1065,11 +1077,14 @@ check_timeout(void)
   if (timeout)
     {
       int ms = get_run_time_ms(NULL);
+      if (timeout - ms < timer_time && timeout >= ms) timer_time = timeout - ms;
       if (verbose > 1)
 	fprintf(stderr, "[time check: %d msec]\n", ms);
       if (ms > timeout && ms > extra_timeout)
 	err("TO: Time limit exceeded");
     }
+  if (timer_tick && timer_time >= 0)
+      set_timer(timer_time + 100);
 }
 
 static void
@@ -1092,7 +1107,7 @@ box_keeper(void)
     {
       sa.sa_handler = signal_alarm;
       sigaction(SIGALRM, &sa, NULL);
-      alarm(1);
+      set_timer(timeout+100);
     }
 
   for(;;)

From 66c235f47f93be463131f485f900fd9567c33adf Mon Sep 17 00:00:00 2001
From: Shaun Ren <shaun.ren@linux.com>
Date: Fri, 8 Nov 2013 18:08:54 -0500
Subject: [PATCH 2/2] set timer based on maximum of wall_timeout and timeout

---
 isolate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isolate.c b/isolate.c
index 0a11cb6..4770749 100644
--- a/isolate.c
+++ b/isolate.c
@@ -1107,7 +1107,7 @@ box_keeper(void)
     {
       sa.sa_handler = signal_alarm;
       sigaction(SIGALRM, &sa, NULL);
-      set_timer(timeout+100);
+      set_timer((wall_timeout<timeout ? timeout : wall_timeout) + 100);
     }
 
   for(;;)