Fix browser.test_pthreads_started_in_worker test failure

Author: kleisauke

system/lib/libc/musl/src/thread/__timedwait.c

@@ -57,12 +57,12 @@ int __timedwait_cp(volatile int *addr, int val,
 #ifdef __EMSCRIPTEN__
 	pthread_t self = __pthread_self();
 	double msecsToSleep = top ? (top->tv_sec * 1000 + top->tv_nsec / 1000000.0) : INFINITY;
-	int is_main_thread = emscripten_is_main_browser_thread();
+	int is_runtime_thread = emscripten_is_main_runtime_thread();
 
-	// Main browser thread may need to run proxied calls, so sleep in very small slices to be responsive.
-	const double maxMsecsSliceToSleep = is_main_thread ? 1 : 100;
+	// Main runtime thread may need to run proxied calls, so sleep in very small slices to be responsive.
+	const double maxMsecsSliceToSleep = is_runtime_thread ? 1 : 100;
 
-	if (is_main_thread || self->cancelasync) {
+	if (is_runtime_thread || !self->canceldisable || self->cancelasync) {
 		double sleepUntilTime = emscripten_get_now() + msecsToSleep;
 		do {
 			if (self->cancel) {
@@ -72,7 +72,7 @@ int __timedwait_cp(volatile int *addr, int val,
 				return ECANCELED;
 			}
 			// Assist other threads by executing proxied operations that are effectively singlethreaded.
-			if (is_main_thread) emscripten_main_thread_process_queued_calls();
+			if (is_runtime_thread) emscripten_main_thread_process_queued_calls();
 			// Must wait in slices in case this thread is cancelled in between.
 			double waitMsecs = sleepUntilTime - emscripten_get_now();
 			if (waitMsecs <= 0) {

system/lib/libc/musl/src/thread/__wait.c

@@ -13,10 +13,10 @@ void __wait(volatile int *addr, volatile int *waiters, int val, int priv)
 	if (waiters) a_inc(waiters);
 #ifdef __EMSCRIPTEN__
 	pthread_t self = __pthread_self();
-	int is_main_thread = emscripten_is_main_runtime_thread();
+	int is_runtime_thread = emscripten_is_main_runtime_thread();
 
 	// Main runtime thread may need to run proxied calls, so sleep in very small slices to be responsive.
-	const double maxMsecsSliceToSleep = is_main_thread ? 1 : 100;
+	const double maxMsecsSliceToSleep = is_runtime_thread ? 1 : 100;
 
 	while (*addr==val) {
 		if (self->cancelasync) {
@@ -28,7 +28,7 @@ void __wait(volatile int *addr, volatile int *waiters, int val, int priv)
 					return;
 				}
 				// Assist other threads by executing proxied operations that are effectively singlethreaded.
-				if (is_main_thread) emscripten_main_thread_process_queued_calls();
+				if (is_runtime_thread) emscripten_main_thread_process_queued_calls();
 				e = emscripten_futex_wait(addr, val, maxMsecsSliceToSleep);
 			} while(e == -ETIMEDOUT);
 		} else {