Skip to content

use setitimer instead of alarm in isolate #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

use setitimer instead of alarm in isolate #203

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f77ce7e
isolate now uses setitimer
shaunren Nov 8, 2013
1af72a3
set timer based on maximum of wall_timeout and timeout
shaunren Nov 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions isolate/isolate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -969,7 +980,6 @@ signal_alarm(int unused UNUSED)
{
/* Time limit checks are synchronous, so we only schedule them there. */
timer_tick = 1;
alarm(1);
}

static void
Expand Down Expand Up @@ -1048,9 +1058,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)
Expand All @@ -1059,11 +1071,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
Expand All @@ -1086,7 +1101,7 @@ box_keeper(void)
{
sa.sa_handler = signal_alarm;
sigaction(SIGALRM, &sa, NULL);
alarm(1);
set_timer((wall_timeout<timeout ? timeout : wall_timeout) + 100);
}

for(;;)
Expand Down