Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-31 14:15:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 906331 - Make sure to init() and destroy PerThreadData instances in worker threads, r=billm.

Browse Source
This commit is contained in:
Brian Hackett 2013-08-19 10:50:03 -06:00
parent 4aa9c2a48c
commit cd5676c85a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/jsworkers.cpp
View File

@ -345,10 +345,10 @@ WorkerThreadState::init(JSRuntime *rt)
helper.thread = PR_CreateThread(PR_USER_THREAD,
WorkerThread::ThreadMain, &helper,
PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
if (!helper.thread) {
if (!helper.thread || !helper.threadData.ref().init()) {
for (size_t j = 0; j < numThreads; j++)
threads[j].destroy();
js_delete(threads);
js_free(threads);
threads = NULL;
numThreads = 0;
return false;
@ -368,7 +368,7 @@ WorkerThreadState::~WorkerThreadState()
if (threads) {
for (size_t i = 0; i < numThreads; i++)
threads[i].destroy();
js_delete(threads);
js_free(threads);
}
if (workerLock)
@ -555,8 +555,10 @@ WorkerThread::destroy()
PR_JoinThread(thread);
}
if (!threadData.empty())
if (!threadData.empty()) {
threadData.ref().removeFromThreadList();
threadData.destroy();
}
}
/* static */