Skip to content

Merge incoming into modular-pthread #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

Conversation

TannerRogalsky
Copy link

Hey!

I'm not sure if this is something you're interested in taking.

I've resolved the merge conflicts between you modular-pthreads work and the current incoming branch of emscripten.

If this is no longer really interesting to you then I might attempt to take over the rest of the work necessary to get this merged as it's useful to me.

Cheers!

juj and others added 30 commits August 16, 2017 12:35
…akeCurrent(EGL_NO_CONTEXT). eglGetProcAddress without a current display/surface/context or eglTerminate() is safe however (https://www.khronos.org/registry/EGL/sdk/docs/man/html/eglGetProcAddress.xhtml), add a note.
… if developer is using emrun while running tests, chances of port collision are smaller.
…);" to make it easier to be refactored to be thread-safe later.
…on first equals sign, but ended up splitting to possibly more than two parts. emscripten-core#5467
For the one-line fix for test_vr.c provided with emscripten-core#5470.

Signed-off-by: Squareys <[email protected]>
[One-Line/Trivial] Fix tiny copy&paste error in test_vr
…d mode we still need it for c++ thread checks like the identity of threads
…ndlers/onerror, the 'e' object in "window.addEventListener('error', function(e) { ..." is never a string, but always an error object, so stop testing for the presence of that directly as a string.
…/get_canvas_element_size() which are slimmer to the point and allow specifying the target canvas element to resize, instead of relying on a singleton Module['canvas'].
…_set_get_canvas_size

deprecate_emscripten_set_get_canvas_size
…pthread startup routine so that calling functions that check the validity of the stack is safe from pthreads.
juj and others added 25 commits November 10, 2017 19:22
…pi_in_pthread

Multithreading 10/N: Emscripten Browser API functions in pthreads
…oad_plugins*, emscripten_worker* and a couple of others to be called from pthreads.
Multithreading 11/N: src/library.js in pthreads
…_pthread

Multithreading 12/N: Async Emscripten Browser API in pthreads
…ble in all test code. Fixes a noisy 'assert is undefined' print during the test.
… "C.UTF-8", and add a test that setlocale(LC_ALL, "") accesses it. The test passes when building a native application with GCC on Linux and MinGW toolchain on Windows, so looks like a good default.
Take `randomBytes` in quotes, otherwise Closure Compiler will mangle it
* Few externs fixes for Closure Compiler that causes tests to fail

* Fix an error accidentally introduced in e47ce4d

* Fixed some Closure Compiler warnings about duplicated arguments definitions (`dest` is present twice in JsDoc)

* Fix for Closure Compiler's `variable addEventListener is undeclared` by introducing corresponding extern

* Added more externs to silence errors and added `var` before `xhr` variable in some places

* One more JsDoc corrected and fixed duplicated variables definitions

* Fixed few more undeclared/redeclared variables

* Fixed a bug where variable name was incorrect in GL

* Added very basic WebGL2 externs.
Some tweaks to GL externs that caused certain tests to fail.

* Unnecessary `var`
…sm_heap_resizing

no_heap_copy_with_wasm_heap_resizing
@bvibber
Copy link
Owner

bvibber commented Nov 16, 2017

Awesome! Might want to give @juj a ping -- I've got an old pull request open emscripten-core#5016 which needs cleanup and review, and if you've already done some of the cleanup that may help! :)

(updated with correct pull req)

@juj
Copy link

juj commented Nov 16, 2017

This is great, we do definitely want to coordinate to get MODULARIZE and USE_PTHREADS working well together. I see the PR above has a lot of unrelated commits, I think those should go away by rebasing to latest incoming?

bvibber pushed a commit that referenced this pull request Jul 3, 2019
…mscripten-core#8744)

This reverts commit 1d198e4.

Apparently this cause a failure on the mac builder:
https://ci.chromium.org/p/emscripten-releases/builders/ci/mac/b8911649373078606944

```
cache:INFO:  - ok
Traceback (most recent call last):
  File "/b/s/w/ir/k/install/emscripten/emcc.py", line 3391, in <module>
    sys.exit(run(sys.argv))
  File "/b/s/w/ir/k/install/emscripten/emcc.py", line 1894, in run
    final = shared.Building.link(linker_inputs, DEFAULT_FINAL, force_archive_contents=force_archive_contents, just_calculate=just_calculate)
  File "/b/s/w/ir/k/install/emscripten/tools/shared.py", line 1940, in link
    Building.read_link_inputs([x for x in files if not x.startswith('-')])
  File "/b/s/w/ir/k/install/emscripten/tools/shared.py", line 1721, in read_link_inputs
    object_names_in_archives = pool.map(extract_archive_contents, archive_names)
  File "/b/s/w/ir/cipd_bin_packages/lib/python2.7/multiprocessing/pool.py", line 253, in map
    return self.map_async(func, iterable, chunksize).get()
  File "/b/s/w/ir/cipd_bin_packages/lib/python2.7/multiprocessing/pool.py", line 572, in get
    raise self._value
IOError: [Errno 2] No such file or directory: u'/b/s/w/ir/tmp/t/emscripten_temp_oIE5H7_archive_contents/#1/12'
```
@TannerRogalsky TannerRogalsky deleted the brion_merge branch March 8, 2020 12:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.