aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2014-03-03 14:10:55 -0800
committerAlon Zakai <alonzakai@gmail.com>2014-03-03 14:10:55 -0800
commit6ec190d3940cc2c115563ac924dc9a18325bf8c2 (patch)
tree59895b9a082e20d072510ad72f0a72b3c08999b2 /system
parentaca0e4d8b27f797d8bf3338e2032aa758d3fde98 (diff)
parent168ec74a34743e3b2dc295ada9ccecbc689cf441 (diff)
Merge branch 'allow_multiple_worker_responses' of github.com:virusdave/emscripten into incoming
Conflicts: AUTHORS
Diffstat (limited to 'system')
-rw-r--r--system/include/emscripten/emscripten.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/system/include/emscripten/emscripten.h b/system/include/emscripten/emscripten.h
index 26ecdf0e..7a2b8175 100644
--- a/system/include/emscripten/emscripten.h
+++ b/system/include/emscripten/emscripten.h
@@ -400,10 +400,15 @@ void emscripten_destroy_worker(worker_handle worker);
void emscripten_call_worker(worker_handle worker, const char *funcname, char *data, int size, void (*callback)(char *, int, void*), void *arg);
/*
- * Sends a response when in a worker call. Should only be
- * called once in each call.
+ * Sends a response when in a worker call. Both functions post a message
+ * back to the thread which called the worker. The _respond_provisionally
+ * variant can be invoked multiple times, which will queue up messages to
+ * be posted to the worker's creator. Eventually, the _respond variant can
+ * be invoked, which will disallow further messages and free framework
+ * resources previously allocated for this worker call.
*/
void emscripten_worker_respond(char *data, int size);
+void emscripten_worker_respond_provisionally(char *data, int size);
/*
* Checks how many responses are being waited for from a worker. This