Decrelment keepalive counter in emscripten_clear_timeout

This change also cleans up the emscripten tests relating to the event
loop.  The browser tests were only being run in `PROXY_TO_PTHREAD` mode
for some reason even though these tests should pass on the main thread.

In test_other the `PROXY_TO_PTHREAD` flags were being passed as args
(rather then emcc_args).  Likely a copy/paste bug.

Author: sbc100

src/lib/libeventloop.js

@@ -21,6 +21,13 @@ LibraryJSEventLoop = {
     }, timeout);
   },
 
+  $safeClearTimeout: (id) => {
+    // TODO: Track outstanding timeout IDs so that we can avoid calling
+    // runtimeKeepalivePop trice for the same timeout.
+    {{{ runtimeKeepalivePop() }}}
+    clearTimeout(id);
+  },
+
   // Just like setImmediate but returns an i32 that can be passed back
   // to wasm rather than a JS object.
   $setImmediateWrapped: (func) => {
@@ -119,13 +126,7 @@ LibraryJSEventLoop = {
   emscripten_set_timeout: (cb, msecs, userData) =>
     safeSetTimeout(() => {{{ makeDynCall('vp', 'cb') }}}(userData), msecs),
 
-#if AUDIO_WORKLET
-  // Use a wrapper function here since simply aliasing `clearTimeout` would
-  // cause the module to fail to load in the audio worklet context.
-  emscripten_clear_timeout: (id) => clearTimeout(id),
-#else
-  emscripten_clear_timeout: 'clearTimeout',
-#endif
+  emscripten_clear_timeout: '$safeClearTimeout',
 
   emscripten_set_timeout_loop__deps: ['$callUserCallback', 'emscripten_get_now'],
   emscripten_set_timeout_loop: (cb, msecs, userData) => {

src/lib/libsdl.js

@@ -3579,9 +3579,10 @@ var LibrarySDL = {
       () => {{{ makeDynCall('iip', 'callback') }}}(interval, param),
       interval),
 
+  SDL_RemoveTimer__deps: ['$safeClearTimeout'],
   SDL_RemoveTimer__proxy: 'sync',
   SDL_RemoveTimer: (id) => {
-    clearTimeout(id);
+    safeClearTimeout(id);
     return true;
   },
 

test/emscripten_performance_now.c

@@ -12,9 +12,7 @@ void test(void *userData) {
   double now3 = emscripten_date_now();
   assert(now3 >= dateNow + 100);
 
-#ifdef REPORT_RESULT
-  REPORT_RESULT(0);
-#endif
+  exit(0);
 }
 
 int main() {
@@ -30,4 +28,5 @@ int main() {
 #else
   emscripten_set_timeout(test, 200, 0);
 #endif
+  return 99;
 }

test/emscripten_set_interval.c

@@ -7,6 +7,7 @@
 int funcExecuted = 0;
 
 void testDone(void *userData) {
+  printf("testDone\n");
   assert((long)userData == 2);
   assert(funcExecuted == 10);
   exit(0);
@@ -15,6 +16,7 @@ void testDone(void *userData) {
 long intervalId = 0;
 
 void tick(void *userData) {
+  printf("tick: %d\n", funcExecuted);
   assert((long)userData == 1);
   ++funcExecuted;
   if (funcExecuted == 10) {
@@ -28,6 +30,5 @@ void tick(void *userData) {
 
 int main() {
   intervalId = emscripten_set_interval(tick, 100, (void*)1);
-  emscripten_exit_with_live_runtime();
   return 99;
 }

test/emscripten_set_timeout.c

@@ -1,34 +1,35 @@
 #include <emscripten/emscripten.h>
 #include <emscripten/html5.h>
-#include <emscripten/em_asm.h>
 #include <assert.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 int func1Executed = 0;
 int func2Executed = 0;
 
 void func1(void *userData);
 
 void func2(void *userData) {
+  printf("func2: %d\n", func2Executed);
   assert((long)userData == 2);
   ++func2Executed;
 
-  if (func2Executed == 1)
-  {
+  if (func2Executed == 1) {
     // Test canceling a setTimeout: register a callback but then cancel it immediately
     long id = emscripten_set_timeout(func1, 10, (void*)2);
     emscripten_clear_timeout(id);
 
     emscripten_set_timeout(func2, 100, (void*)2);
   }
-  if (func2Executed == 2)
-  {
+
+  if (func2Executed == 2) {
     assert(func1Executed == 1);
     exit(0);
   }
 }
 
 void func1(void *userData) {
+  printf("func1\n");
   assert((long)userData == 1);
   ++func1Executed;
 
@@ -39,6 +40,5 @@ void func1(void *userData) {
 
 int main() {
   emscripten_set_timeout(func1, 100, (void*)1);
-  emscripten_exit_with_live_runtime();
   return 99;
 }

test/emscripten_set_timeout_loop.c

@@ -1,32 +1,34 @@
 #include <emscripten/emscripten.h>
 #include <emscripten/html5.h>
-#include <emscripten/em_asm.h>
 #include <assert.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 double previousSetTimeouTime = 0;
 int funcExecuted = 0;
 
 void testDone(void *userData) {
+  printf("testDone\n");
   assert((long)userData == 2);
   assert(funcExecuted == 10);
+  emscripten_runtime_keepalive_pop();
   exit(0);
 }
 
 bool tick(double time, void *userData) {
+  printf("tick: %d\n", funcExecuted);
   assert(time >= previousSetTimeouTime);
   previousSetTimeouTime = time;
   assert((long)userData == 1);
   ++funcExecuted;
-  if (funcExecuted == 10)
-  {
+  if (funcExecuted == 10) {
     emscripten_set_timeout(testDone, 300, (void*)2);
   }
   return funcExecuted < 10;
 }
 
 int main() {
   emscripten_set_timeout_loop(tick, 100, (void*)1);
-  emscripten_exit_with_live_runtime();
+  emscripten_runtime_keepalive_push();
   return 99;
 }

test/other/codesize/test_codesize_hello_O0.gzsize

@@ -1 +1 @@
-7984
+7989

test/other/codesize/test_codesize_hello_O0.jssize

@@ -1 +1 @@
-21327
+21344

test/other/codesize/test_codesize_minimal_O0.gzsize

@@ -1 +1 @@
-6330
+6336

test/other/codesize/test_codesize_minimal_O0.jssize

@@ -1 +1 @@
-16673
+16690

test/other/test_unoptimized_code_size.js.size

@@ -1 +1 @@
-52478
+52500

test/other/test_unoptimized_code_size_strict.js.size

@@ -1 +1 @@
-50766
+50788

test/test_browser.py

@@ -200,7 +200,22 @@ def decorated(self, threads, *args, **kwargs):
     f(self, *args, **kwargs)
 
   parameterize(decorated, {'': (False,),
-                           'pthreads': (True,)})
+                           'pthread': (True,)})
+
+  return decorated
+
+
+def also_with_proxy_to_pthread(f):
+  assert callable(f)
+
+  @wraps(f)
+  def decorated(self, threads, *args, **kwargs):
+    if threads:
+      self.emcc_args += ['-pthread', '-sPROXY_TO_PTHREAD']
+    f(self, *args, **kwargs)
+
+  parameterize(decorated, {'': (False,),
+                           'pthread': (True,)})
 
   return decorated
 
@@ -496,14 +511,11 @@ def make_main_two_files(path1, path2, nonexistingpath):
     self.btest_exit('main.c', args=['--pre-js', 'pre.js', '--use-preload-plugins'])
 
   # Tests that user .html shell files can manually download .data files created with --preload-file cmdline.
-  @parameterized({
-    '': ([],),
-    'pthreads': (['-pthread', '-sPROXY_TO_PTHREAD', '-sEXIT_RUNTIME'],),
-  })
-  def test_preload_file_with_manual_data_download(self, args):
+  @also_with_proxy_to_pthread
+  def test_preload_file_with_manual_data_download(self):
     create_file('file.txt', 'Hello!')
 
-    self.compile_btest('browser/test_manual_download_data.c', ['-sEXIT_RUNTIME', '-o', 'out.js', '--preload-file', 'file.txt@/file.txt'] + args)
+    self.compile_btest('browser/test_manual_download_data.c', ['-sEXIT_RUNTIME', '-o', 'out.js', '--preload-file', 'file.txt@/file.txt'])
     shutil.copy(test_file('browser/test_manual_download_data.html'), '.')
 
     # Move .data file out of server root to ensure that getPreloadedPackage is actually used
@@ -1603,12 +1615,9 @@ def test_glfw_time(self):
   def test_egl(self, args):
     self.btest_exit('test_egl.c', args=['-O2', '-lEGL', '-lGL', '-sGL_ENABLE_GET_PROC_ADDRESS'] + args)
 
-  @parameterized({
-    '': ([],),
-    'proxy_to_pthread': (['-pthread', '-sPROXY_TO_PTHREAD'],),
-  })
-  def test_egl_width_height(self, args):
-    self.btest_exit('test_egl_width_height.c', args=['-O2', '-lEGL', '-lGL'] + args)
+  @also_with_proxy_to_pthread
+  def test_egl_width_height(self):
+    self.btest_exit('test_egl_width_height.c', args=['-O2', '-lEGL', '-lGL'])
 
   @requires_graphics_hardware
   def test_egl_createcontext_error(self):
@@ -1901,27 +1910,17 @@ def test_emscripten_fs_api2(self):
     self.btest_exit('emscripten_fs_api_browser2.c', args=['-sASSERTIONS=0'])
     self.btest_exit('emscripten_fs_api_browser2.c', args=['-sASSERTIONS=1'])
 
-  @parameterized({
-    '': ([],),
-    'pthreads': (['-pthread', '-sPROXY_TO_PTHREAD', '-sEXIT_RUNTIME'],),
-  })
-  def test_emscripten_main_loop(self, args):
-    self.btest_exit('test_emscripten_main_loop.c', args=args)
+  @also_with_proxy_to_pthread
+  def test_emscripten_main_loop(self):
+    self.btest_exit('test_emscripten_main_loop.c')
 
-  @parameterized({
-    '': ([],),
-    # test pthreads + AUTO_JS_LIBRARIES mode as well
-    'pthreads': (['-pthread', '-sPROXY_TO_PTHREAD', '-sAUTO_JS_LIBRARIES=0'],),
-  })
-  def test_emscripten_main_loop_settimeout(self, args):
-    self.btest_exit('test_emscripten_main_loop_settimeout.c', args=args)
+  @also_with_proxy_to_pthread
+  def test_emscripten_main_loop_settimeout(self):
+    self.btest_exit('test_emscripten_main_loop_settimeout.c', args=['-sAUTO_JS_LIBRARIES=0'])
 
-  @parameterized({
-    '': ([],),
-    'pthreads': (['-pthread', '-sPROXY_TO_PTHREAD'],),
-  })
-  def test_emscripten_main_loop_and_blocker(self, args):
-    self.btest_exit('test_emscripten_main_loop_and_blocker.c', args=args)
+  @also_with_proxy_to_pthread
+  def test_emscripten_main_loop_and_blocker(self):
+    self.btest_exit('test_emscripten_main_loop_and_blocker.c')
 
   def test_emscripten_main_loop_and_blocker_exit(self):
     # Same as above but tests that EXIT_RUNTIME works with emscripten_main_loop.  The
@@ -1977,13 +1976,10 @@ def test_sdl_glshader2(self):
   def test_gl_glteximage(self):
     self.btest('gl_teximage.c', '1', args=['-lGL', '-lSDL'])
 
-  @parameterized({
-    '': ([],),
-    'pthreads': (['-pthread', '-sPROXY_TO_PTHREAD', '-sOFFSCREEN_FRAMEBUFFER'],),
-  })
   @requires_graphics_hardware
-  def test_gl_textures(self, args):
-    self.btest_exit('gl_textures.c', args=['-lGL', '-g', '-sSTACK_SIZE=1MB'] + args)
+  @also_with_proxy_to_pthread
+  def test_gl_textures(self):
+    self.btest_exit('gl_textures.c', args=['-lGL', '-g', '-sSTACK_SIZE=1MB', '-sOFFSCREEN_FRAMEBUFFER'])
 
   @requires_graphics_hardware
   def test_gl_ps(self):
@@ -2618,10 +2614,10 @@ def test_html5_core(self, opts):
       self.emcc_args.append('--pre-js=pre.js')
     self.btest_exit('test_html5_core.c', args=opts)
 
+  @also_with_proxy_to_pthread
   @parameterized({
     '': ([],),
     'closure': (['-O2', '-g1', '--closure=1'],),
-    'pthread': (['-pthread', '-sPROXY_TO_PTHREAD'],),
   })
   def test_html5_gamepad(self, args):
     self.btest_exit('test_gamepad.c', args=args)
@@ -4932,24 +4928,28 @@ def test_emscripten_request_animation_frame_loop(self):
   def test_request_animation_frame(self):
     self.btest_exit('test_request_animation_frame.c')
 
+  @also_with_proxy_to_pthread
   def test_emscripten_set_timeout(self):
-    self.btest_exit('emscripten_set_timeout.c', args=['-pthread', '-sPROXY_TO_PTHREAD'])
+    self.btest_exit('emscripten_set_timeout.c')
 
+  @also_with_proxy_to_pthread
   def test_emscripten_set_timeout_loop(self):
-    self.btest_exit('emscripten_set_timeout_loop.c', args=['-pthread', '-sPROXY_TO_PTHREAD'])
+    self.btest_exit('emscripten_set_timeout_loop.c')
 
   def test_emscripten_set_immediate(self):
     self.btest_exit('emscripten_set_immediate.c')
 
   def test_emscripten_set_immediate_loop(self):
     self.btest_exit('emscripten_set_immediate_loop.c')
 
+  @also_with_proxy_to_pthread
   def test_emscripten_set_interval(self):
-    self.btest_exit('emscripten_set_interval.c', args=['-pthread', '-sPROXY_TO_PTHREAD'])
+    self.btest_exit('emscripten_set_interval.c')
 
   # Test emscripten_performance_now() and emscripten_date_now()
+  @also_with_proxy_to_pthread
   def test_emscripten_performance_now(self):
-    self.btest('emscripten_performance_now.c', '0', args=['-pthread', '-sPROXY_TO_PTHREAD'])
+    self.btest_exit('emscripten_performance_now.c')
 
   def test_embind_with_pthreads(self):
     self.btest_exit('embind/test_pthreads.cpp', args=['-lembind', '-pthread', '-sPTHREAD_POOL_SIZE=2'])
@@ -5021,12 +5021,9 @@ def test_minimal_runtime_loader_shell(self, args):
   def test_minimal_runtime_hello_world(self, args):
     self.btest_exit('small_hello_world.c', args=args + ['-sMINIMAL_RUNTIME'])
 
-  @parameterized({
-    '': ([],),
-    'pthread': (['-sPROXY_TO_PTHREAD', '-pthread'],)
-  })
-  def test_offset_converter(self, args):
-    self.btest_exit('test_offset_converter.c', args=['-sUSE_OFFSET_CONVERTER', '-gsource-map'] + args)
+  @also_with_proxy_to_pthread
+  def test_offset_converter(self):
+    self.btest_exit('test_offset_converter.c', args=['-sUSE_OFFSET_CONVERTER', '-gsource-map'])
 
   # Tests emscripten_unwind_to_js_event_loop() behavior
   def test_emscripten_unwind_to_js_event_loop(self):

test/test_other.py

@@ -13883,9 +13883,8 @@ def test_pthread_trap(self):
   def test_pthread_kill(self):
     self.do_run_in_out_file_test('pthread/test_pthread_kill.c')
 
-  @node_pthreads
   def test_emscripten_set_interval(self):
-    self.do_runf('emscripten_set_interval.c', args=['-pthread', '-sPROXY_TO_PTHREAD'])
+    self.do_runf('emscripten_set_interval.c')
 
   # Test emscripten_console_log(), emscripten_console_warn() and emscripten_console_error()
   def test_emscripten_console_log(self):
@@ -13895,13 +13894,11 @@ def test_emscripten_console_log(self):
   def test_emscripten_unwind_to_js_event_loop(self):
     self.do_runf('test_emscripten_unwind_to_js_event_loop.c')
 
-  @node_pthreads
   def test_emscripten_set_timeout(self):
-    self.do_runf('emscripten_set_timeout.c', args=['-pthread', '-sPROXY_TO_PTHREAD'])
+    self.do_runf('emscripten_set_timeout.c')
 
-  @node_pthreads
   def test_emscripten_set_timeout_loop(self):
-    self.do_runf('emscripten_set_timeout_loop.c', args=['-pthread', '-sPROXY_TO_PTHREAD'])
+    self.do_runf('emscripten_set_timeout_loop.c')
 
   # Verify that we are able to successfully compile a script when the Windows 7
   # and Python workaround env. vars are enabled.