Tidy test, run (and exit)

Author: cwoffenden

test/test_interactive.py

@@ -296,7 +296,7 @@ def test_audio_worklet(self):
   # Tests AudioWorklet with emscripten_lock_busyspin_wait_acquire() and friends.
   @also_with_minimal_runtime
   def test_audio_worklet_emscripten_locks(self):
-    self.btest('webaudio/audioworklet_emscripten_locks.c', expected='0', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS', '-pthread', '-sPTHREAD_POOL_SIZE=2'])
+    self.btest_exit('webaudio/audioworklet_emscripten_locks.c', args=['-sAUDIO_WORKLET', '-sWASM_WORKERS', '-pthread', '-sPTHREAD_POOL_SIZE=2'])
 
   # Tests a second AudioWorklet example: sine wave tone generator.
   def test_audio_worklet_tone_generator(self):

test/webaudio/audioworklet_emscripten_locks.c

@@ -5,7 +5,8 @@
 #include <stdlib.h>
 #include <assert.h>
 
-// Tests that these audio worklet compatible functions work, details in comments below.
+// Tests that these audio worklet compatible functions work, details in comments below:
+//
 // - emscripten_thread_supports_atomics_wait()
 // - emscripten_lock_init()
 // - emscripten_lock_try_acquire()
@@ -35,8 +36,11 @@ typedef enum {
   TEST_DONE
 } Test;
 
+// Lock used in all the tests
 emscripten_lock_t testLock = EMSCRIPTEN_LOCK_T_STATIC_INITIALIZER;
+// Which test is running (sometimes in the worklet, sometimes in the main thread)
 _Atomic Test whichTest = TEST_HAS_WAIT;
+// Time at which the test starts taken in main()
 double startTime = 0;
 
 bool ProcessAudio(int numInputs, const AudioSampleFrame *inputs, int numOutputs, AudioSampleFrame *outputs, int numParams, const AudioParamFrame *params, void *userData) {
@@ -63,7 +67,7 @@ bool ProcessAudio(int numInputs, const AudioSampleFrame *inputs, int numOutputs,
     assert(!result);
     whichTest = TEST_WAIT_ACQUIRE;
   case TEST_WAIT_ACQUIRE:
-    // Will get unlocked in main, so should quickly acquire
+    // Will get unlocked in main thread, so should quickly acquire
     result = emscripten_lock_busyspin_wait_acquire(&testLock, 100);
     printf("TEST_WAIT_ACQUIRE: %d\n", result);
     assert(result);
@@ -78,16 +82,22 @@ bool ProcessAudio(int numInputs, const AudioSampleFrame *inputs, int numOutputs,
     whichTest = TEST_WAIT_INFINTE_1;
     break;
   case TEST_WAIT_INFINTE_1:
-    // Still locked when we enter here
+    // Still locked when we enter here but move on in the main thread
+    break;
+  case TEST_WAIT_INFINTE_2:
+    emscripten_lock_release(&testLock);
+    whichTest = TEST_GET_NOW;
+    break;
   case TEST_GET_NOW:
     result = (int) (emscripten_get_now() - startTime);
     printf("TEST_GET_NOW: %d\n", result);
-    assert(result);
+    assert(result > 0);
     whichTest = TEST_DONE;
+  case TEST_DONE:
+    return false;
   default:
     break;
   }
-
   return true;
 }
 
@@ -103,17 +113,19 @@ EM_JS(void, InitHtmlUi, (EMSCRIPTEN_WEBAUDIO_T audioContext), {
 });
 
 bool MainLoop(double time, void* data) {
-  int result = 0;
   switch (whichTest) {
   case TEST_WAIT_ACQUIRE:
     // Release here to acquire in process
     emscripten_lock_release(&testLock);
     break;
   case TEST_WAIT_INFINTE_1:
-    // Spin here until released in process
+    // Spin here until released in process (but don't change test until we know this case ran)
+    whichTest = TEST_WAIT_INFINTE_2;
     emscripten_lock_busyspin_waitinf_acquire(&testLock);
-    whichTest = TEST_DONE;
+    printf("TEST_WAIT_INFINTE (from main)\n");
     break;
+  case TEST_DONE:
+    return false;
   default:
     break;
   }
@@ -133,7 +145,7 @@ void WebAudioWorkletThreadInitialized(EMSCRIPTEN_WEBAUDIO_T audioContext, bool s
   emscripten_create_wasm_audio_worklet_processor_async(audioContext, &opts, AudioWorkletProcessorCreated, NULL);
 }
 
-uint8_t wasmAudioWorkletStack[4096];
+uint8_t wasmAudioWorkletStack[2048];
 
 int main() {
   // Main thread init and acquire (work passes to the processor)