Skip to content
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.

Sign up for GitHub

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

Return detached threads to the pool #8286

Merged
merged 19 commits into from
May 20, 2019
Merged

Return detached threads to the pool #8286

Changes from 3 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
aac8627
Return detached threads to the pool
VirtualTim Mar 12, 2019
7b8a67c
Check if a thread is detached before freeing its resources
VirtualTim Mar 12, 2019
8438f0e
Fix typo in previous commit
VirtualTim Mar 12, 2019
e40b80c
Extract 'returning threads to the pool' into a function
VirtualTim Apr 17, 2019
7a5d296
When workers are returned to the pool remove their disposed thread fr…
VirtualTim Apr 24, 2019
86baf13
Add a test for detached threads
VirtualTim Apr 24, 2019
ee97e8a
Add test_pthread_join test.
VirtualTim Apr 24, 2019
1dab304
Code Review Changes
VirtualTim May 7, 2019
921628b
Update detached thread test to run much quicker
VirtualTim May 7, 2019
461ddb4
Missed two function renames
VirtualTim May 7, 2019
b1cd5b3
Fix thread resources being double freed on join.
VirtualTim May 9, 2019
70bd24c
Fix thread resources being double freed on join Part2
VirtualTim May 9, 2019
4e29926
test_pthread_detach -> test_std_thread_detach
VirtualTim May 10, 2019
2c48635
rename test to test_std_thread_detach
VirtualTim May 10, 2019
773e863
Revert changes that caused a double free.
VirtualTim May 10, 2019
6ee3d7e
Fix cleanup ordering. Moved setting thread exit status to after main …
VirtualTim May 13, 2019
31a5da8
Merge from emscripten-core/incoming
VirtualTim May 16, 2019
bc6e5ad
See if this this allows join on the main thread.
VirtualTim May 17, 2019
f82d037
Don't try and clean up an cleaned up thread
VirtualTim May 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/library_pthread.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ var LibraryPThread = {
delete Module['canvas'];
#endif

postMessage({ cmd: 'exit' });
postMessage({ cmd: 'exit', threadId: tb });
VirtualTim marked this conversation as resolved.
Show resolved Hide resolved
}
}
},
Expand Down Expand Up @@ -319,18 +319,18 @@ var LibraryPThread = {
err('Thread ' + d.threadId + ': ' + d.text);
} else if (d.cmd === 'alert') {
alert('Thread ' + d.threadId + ': ' + d.text);
} else if (d.cmd === 'exit') {
// Thread is exiting, no-op here
} else if (d.cmd === 'exitProcess') {
// A pthread has requested to exit the whole application process (runtime).
Module['noExitRuntime'] = false;
exit(d.returnCode);
} else if (d.cmd === 'cancelDone') {
PThread.freeThreadData(worker.pthread);
worker.pthread = undefined; // Detach the worker from the pthread object, and return it to the worker pool as an unused worker.
PThread.unusedWorkerPool.push(worker);
// TODO: Free if detached.
PThread.runningWorkers.splice(PThread.runningWorkers.indexOf(worker.pthread), 1); // Not a running Worker anymore.
} else if (d.cmd === 'exit' || d.cmd === 'cancelDone') {
var detached = Atomics.load(HEAPU32, (d.threadId + {{{ C_STRUCTS.pthread.detached }}} ) >> 2);
VirtualTim marked this conversation as resolved.
Show resolved Hide resolved
if (detached) {
PThread.freeThreadData(worker.pthread);
worker.pthread = undefined; // Detach the worker from the pthread object, and return it to the worker pool as an unused worker.
PThread.unusedWorkerPool.push(worker);
PThread.runningWorkers.splice(PThread.runningWorkers.indexOf(worker.pthread), 1); // Not a running Worker anymore.
}
} else if (d.cmd === 'objectTransfer') {
PThread.receiveObjectTransfer(e.data);
} else if (e.data.target === 'setimmediate') {
Expand Down