From 922e8e27343704155b81f50ddd3316ec04c9d299 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 9 Aug 2018 13:50:49 +0200 Subject: executor: mount binfmt_mist We forgot to mount binfmt_misc. Mount it. Add a test. Increase per-call timeout, otherwise last execve timesout. Fix csource waiting for call completion at the end of program. --- executor/common.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'executor/common.h') diff --git a/executor/common.h b/executor/common.h index 7255b7dc7..04358d1b1 100644 --- a/executor/common.h +++ b/executor/common.h @@ -418,7 +418,7 @@ static void loop() #if SYZ_TRACE printf("### start\n"); #endif - int call, thread; + int i, call, thread; #if SYZ_COLLIDE int collide = 0; again: @@ -443,12 +443,12 @@ again: if (collide && (call % 2) == 0) break; #endif - event_timedwait(&th->done, 25); - if (__atomic_load_n(&running, __ATOMIC_RELAXED)) - sleep_ms((call == [[NUM_CALLS]] - 1) ? 10 : 2); + event_timedwait(&th->done, 45); break; } } + for (i = 0; i < 100 && __atomic_load_n(&running, __ATOMIC_RELAXED); i++) + sleep_ms(1); #if SYZ_COLLIDE if (!collide) { collide = 1; -- cgit mrf-deployment