remove worker api assertion so that sleep and other emterpreter-sync calls work in workers; #3211

Author: kripken

src/library_browser.js

@@ -1312,7 +1312,6 @@ mergeInto(LibraryManager.library, {
   },
 
   emscripten_worker_respond_provisionally: function(data, size) {
-    if (!inWorkerCall) throw 'not in worker call!';
     if (workerResponded) throw 'already responded with final response!';
     postMessage({
       'callbackId': workerCallbackId,
@@ -1322,7 +1321,6 @@ mergeInto(LibraryManager.library, {
   },
 
   emscripten_worker_respond: function(data, size) {
-    if (!inWorkerCall) throw 'not in worker call!';
     if (workerResponded) throw 'already responded with final response!';
     workerResponded = true;
     postMessage({

src/postamble.js

@@ -300,7 +300,7 @@ function messageResender() {
 }
 
 var buffer = 0, bufferSize = 0;
-var inWorkerCall = false, workerResponded = false, workerCallbackId = -1;
+var workerResponded = false, workerCallbackId = -1;
 
 onmessage = function onmessage(msg) {
   // if main has not yet been called (mem init file, other async things), buffer messages
@@ -326,15 +326,13 @@ onmessage = function onmessage(msg) {
     HEAPU8.set(data, buffer);
   }
 
-  inWorkerCall = true;
   workerResponded = false;
   workerCallbackId = msg.data['callbackId'];
   if (data) {
     func(buffer, data.length);
   } else {
     func(0, 0);
   }
-  inWorkerCall = false;
 }
 
 #endif

tests/test_browser.py

@@ -1936,6 +1936,10 @@ def test_worker_api_3(self):
     Popen([PYTHON, EMCC, path_from_root('tests', 'worker_api_3_worker.cpp'), '-o', 'worker.js', '-s', 'BUILD_AS_WORKER=1', '-s', 'EXPORTED_FUNCTIONS=["_one"]']).communicate()
     self.btest('worker_api_3_main.cpp', expected='5')
 
+  def test_worker_api_sleep(self):
+    Popen([PYTHON, EMCC, path_from_root('tests', 'worker_api_worker_sleep.cpp'), '-o', 'worker.js', '-s', 'BUILD_AS_WORKER=1', '-s', 'EXPORTED_FUNCTIONS=["_one"]', '-s', 'EMTERPRETIFY=1', '-s', 'EMTERPRETIFY_ASYNC=1']).communicate()
+    self.btest('worker_api_main.cpp', expected='566')
+
   def test_emscripten_async_wget2(self):
     self.btest('http.cpp', expected='0', args=['-I' + path_from_root('tests')])
 

tests/worker_api_worker_sleep.cpp

@@ -0,0 +1,17 @@
+#include <assert.h>
+#include <emscripten.h>
+
+extern "C" {
+
+void one(char *data, int size) {
+  int *x = (int*)data;
+  int num = size/sizeof(int);
+  for (int i = 0; i < num; i++) {
+    x[i] += 1234;
+  }
+  emscripten_sleep(1000);
+  emscripten_worker_respond(data, size);
+}
+
+}
+