diff options
| -rw-r--r-- | include/comphelper/threadpool.hxx | 8 | ||||
| -rw-r--r-- | solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk | 2 | ||||
| -rw-r--r-- | static/emscripten/environment.js | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/include/comphelper/threadpool.hxx b/include/comphelper/threadpool.hxx index 84f9dc9284f6..0b2ebc8ac9e6 100644 --- a/include/comphelper/threadpool.hxx +++ b/include/comphelper/threadpool.hxx @@ -67,7 +67,13 @@ public: /** Wait until all queued tasks associated with the tag are completed @param bJoin - if set call joinThreadsIfIdle() at the end */ - void waitUntilDone(const std::shared_ptr<ThreadTaskTag>&, bool bJoin = true); + void waitUntilDone(const std::shared_ptr<ThreadTaskTag>&, bool bJoin = +#if defined EMSCRIPTEN + false +#else + true +#endif + ); /// join all threads if there are no tasks presently. void joinThreadsIfIdle(); diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk index 45beedd1af34..3898ead4448d 100644 --- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk +++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk @@ -15,7 +15,7 @@ gb_EMSCRIPTEN_CPPFLAGS := -pthread -s USE_PTHREADS=1 -D_LARGEFILE64_SOURCE -D_LA gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS) # Initial memory size and worker thread pool -gb_EMSCRIPTEN_LDFLAGS += -s TOTAL_MEMORY=1GB -s PTHREAD_POOL_SIZE=4 +gb_EMSCRIPTEN_LDFLAGS += -s TOTAL_MEMORY=1GB -s PTHREAD_POOL_SIZE=6 # To keep the link time (and memory) down, prevent all rewriting options from wasm-emscripten-finalize # See emscripten.py, finalize_wasm, modify_wasm = True diff --git a/static/emscripten/environment.js b/static/emscripten/environment.js index 5ad1f41363ed..4e5d1f98c596 100644 --- a/static/emscripten/environment.js +++ b/static/emscripten/environment.js @@ -2,5 +2,6 @@ if (!('preRun' in Module)) Module['preRun'] = []; Module.preRun.push(function() { + ENV.MAX_CONCURRENCY = '4'; ENV.SAL_LOG = "+WARN" }); |