Skip to content
Closed
Changes from 1 commit
Commits
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
Prev Previous commit
set timer based on maximum of wall_timeout and timeout
  • Loading branch information
shaunren committed Nov 8, 2013
commit 1af72a3bcd3e736ceda34f62c070f4e04a67ae92
2 changes: 1 addition & 1 deletion isolate/isolate.c
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,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(;;)
Expand Down