From 06bf8101debe879447d0ef3a7a5b84cb11fa5acf Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sun, 2 Jun 2024 11:58:29 +0200 Subject: executor: remove noshmem mode All OSes we have now support shmem. Support for Fuchia/Starnix/Windows wasn't implemented, but generally they support shared memory. Remove all of the complexity and code associated with noshmem mode. If/when we revive these OSes, it's easier to properly implement shmem mode for them. --- executor/common.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'executor/common.h') diff --git a/executor/common.h b/executor/common.h index 9ea4ec3d9..b31500802 100644 --- a/executor/common.h +++ b/executor/common.h @@ -654,7 +654,7 @@ static void loop(void) #if SYZ_EXECUTOR close(kInPipeFd); #endif -#if SYZ_EXECUTOR && SYZ_EXECUTOR_USES_SHMEM +#if SYZ_EXECUTOR close(kOutPipeFd); #endif execute_one(); @@ -672,7 +672,7 @@ static void loop(void) // should be as efficient as sigtimedwait. int status = 0; uint64 start = current_time_ms(); -#if SYZ_EXECUTOR && SYZ_EXECUTOR_USES_SHMEM +#if SYZ_EXECUTOR uint64 last_executed = start; uint32 executed_calls = __atomic_load_n(output_data, __ATOMIC_RELAXED); #endif @@ -681,7 +681,6 @@ static void loop(void) break; sleep_ms(1); #if SYZ_EXECUTOR -#if SYZ_EXECUTOR_USES_SHMEM // Even though the test process executes exit at the end // and execution time of each syscall is bounded by syscall_timeout_ms (~50ms), // this backup watchdog is necessary and its performance is important. @@ -704,10 +703,6 @@ static void loop(void) if ((now - start < program_timeout_ms) && (now - start < min_timeout_ms || now - last_executed < inactive_timeout_ms)) continue; -#else - if (current_time_ms() - start < program_timeout_ms) - continue; -#endif #else if (current_time_ms() - start < /*{{{PROGRAM_TIMEOUT_MS}}}*/) continue; -- cgit mrf-deployment