Fix pthreads + LIBRARY_DEBUG #8303
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sbc100
reviewed
Mar 18, 2019
tests/test_browser.py
Outdated
| @@ -3665,7 +3665,8 @@ def test_pthread_condition_variable(self): | |||
| # Test that pthreads are able to do printf. | |||
| @requires_threads | |||
| def test_pthread_printf(self): | |||
| self.btest(path_from_root('tests', 'pthread', 'test_pthread_printf.cpp'), expected='0', args=['-s', 'TOTAL_MEMORY=64MB', '-O3', '-s', 'USE_PTHREADS=1', '-s', 'PTHREAD_POOL_SIZE=1']) | |||
| for library_debug in [0, 1]: | |||
There was a problem hiding this comment.
I find that the backtrace in the error reporting is nicer if you follow the pattern and avoid loops like this in the test code:
def run(debug):
self.btest(path_from_root('tests', 'pthread', 'test_pthread_printf.cpp'), expected='0', args=['-s', 'TOTAL_MEMORY=64MB', '-O3', '-s', 'USE_PTHREADS=1', '-s', 'PTHREAD_POOL_SIZE=1', '-s', 'LIBRARY_DEBUG=%d' % debug])
run(debug=True)
run(debug=False)
sbc100
reviewed
Mar 18, 2019
src/parseTools.js
Outdated
| assert(bodyEnd > 0); | ||
| return func(name, args, rest.substring(bodyStart + 1, bodyEnd)); | ||
| } | ||
|
|
| assert(bodyStart > 0); | ||
| var bodyEnd = rest.lastIndexOf('}'); | ||
| assert(bodyEnd > 0); | ||
| return func(name, args, rest.substring(bodyStart + 1, bodyEnd)); |
There was a problem hiding this comment.
I'm having trouble seeing there func is defined. Does it return a string?
There was a problem hiding this comment.
I added a comment to clarify this now - basically we do the parsing here, and pass the parsed name, arguments, and body to the passed-in function which returns whatever it wants. (In the actual uses, it returns the string, but other uses could do otherwise.)
VirtualTim
pushed a commit
to VirtualTim/emscripten
that referenced
this pull request
May 21, 2019
Both options modify the JS library functions, but LIBRARY_DEBUG did it in a destructive way (removed arguments from the declaration). This refactors both code locations to call a single helper function which does things properly, and adds a tes
VirtualTim
added a commit
to VirtualTim/emscripten
that referenced
this pull request
May 23, 2019
This reverts commit a1e7f6f.
VirtualTim
added a commit
to VirtualTim/emscripten
that referenced
this pull request
May 23, 2019
This reverts commit a1e7f6f.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Both options modify the JS library functions, but LIBRARY_DEBUG did it in a destructive way (removed arguments from the declaration). This refactors both code locations to call a single helper function which does things properly, and adds a test.