wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 875125 - Construct worker thread's PerThreadData before spawning actual thread on a CLOSED TREE

Browse Source
This commit is contained in:
Brian Hackett 2013-07-19 12:57:12 -06:00
parent 06b9c176de
commit f7d352eb76
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js/src/jsworkers.cpp
View File

@ -311,6 +311,8 @@ WorkerThreadState::init(JSRuntime *rt)
for (size_t i = 0; i < numThreads; i++) {
WorkerThread &helper = threads[i];
helper.runtime = rt;
helper.threadData.construct(rt);
helper.threadData.ref().addToThreadList();
helper.thread = PR_CreateThread(PR_USER_THREAD,
WorkerThread::ThreadMain, &helper,
PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
@ -322,8 +324,6 @@ WorkerThreadState::init(JSRuntime *rt)
numThreads = 0;
return false;
}
helper.threadData.construct(rt);
helper.threadData.ref().addToThreadList();
}
resetAsmJSFailureState();
@ -439,19 +439,20 @@ WorkerThread::destroy()
{
WorkerThreadState &state = *runtime->workerThreadState;
if (!thread)
return;
if (thread) {
{
AutoLockWorkerThreadState lock(runtime);
terminate = true;
{
AutoLockWorkerThreadState lock(runtime);
terminate = true;
/* Notify all workers, to ensure that this thread wakes up. */
state.notifyAll(WorkerThreadState::WORKER);
}
/* Notify all workers, to ensure that this thread wakes up. */
state.notifyAll(WorkerThreadState::WORKER);
PR_JoinThread(thread);
}
PR_JoinThread(thread);
threadData.ref().removeFromThreadList();
if (!threadData.empty())
threadData.ref().removeFromThreadList();
}
/* static */