OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
128 m_workerReportingProxy.workerGlobalScopeStarted(m_workerGlobalScope.get()); | 128 m_workerReportingProxy.workerGlobalScopeStarted(m_workerGlobalScope.get()); |
129 | 129 |
130 WorkerScriptController* script = m_workerGlobalScope->script(); | 130 WorkerScriptController* script = m_workerGlobalScope->script(); |
131 InspectorInstrumentation::willEvaluateWorkerScript(workerGlobalScope(), star tMode); | 131 InspectorInstrumentation::willEvaluateWorkerScript(workerGlobalScope(), star tMode); |
132 script->evaluate(ScriptSourceCode(sourceCode, scriptURL)); | 132 script->evaluate(ScriptSourceCode(sourceCode, scriptURL)); |
133 | 133 |
134 runEventLoop(); | 134 runEventLoop(); |
135 | 135 |
136 ThreadIdentifier threadID = m_threadID; | 136 ThreadIdentifier threadID = m_threadID; |
137 | 137 |
138 #if !ENABLE(OILPAN) | |
139 ASSERT(m_workerGlobalScope->hasOneRef()); | |
140 #endif | |
138 // The below assignment will destroy the context, which will in turn notify messaging proxy. | 141 // The below assignment will destroy the context, which will in turn notify messaging proxy. |
139 // We cannot let any objects survive past thread exit, because no other thre ad will run GC or otherwise destroy them. | 142 // We cannot let any objects survive past thread exit, because no other thre ad will run GC or otherwise destroy them. |
140 // If Oilpan is enabled, we detach of the context/global scope, with the fin al heap cleanup below sweeping it out. | 143 // If Oilpan is enabled, we detach of the context/global scope, with the fin al heap cleanup below sweeping it out. |
141 #if ENABLE(OILPAN) | |
142 m_workerGlobalScope->dispose(); | 144 m_workerGlobalScope->dispose(); |
143 #else | |
144 ASSERT(m_workerGlobalScope->hasOneRef()); | |
145 #endif | |
146 m_workerGlobalScope = nullptr; | 145 m_workerGlobalScope = nullptr; |
147 | 146 |
148 ThreadState::detach(); | 147 ThreadState::detach(); |
haraken
2014/03/17 01:22:56
Shall we move ThreadState::detach() at the very en
haraken
2014/03/17 01:25:45
As far as I read your comment in https://coderevie
sof
2014/03/17 07:46:41
Added a comment, which might address this? (not su
| |
149 | 148 |
149 // Notify proxy that WorkerGlobalScope is now gone. This can free the Worker Thread object, so do not access it after this. | |
150 workerReportingProxy().workerGlobalScopeDestroyed(); | |
151 | |
150 // Clean up PlatformThreadData before WTF::WTFThreadData goes away! | 152 // Clean up PlatformThreadData before WTF::WTFThreadData goes away! |
151 PlatformThreadData::current().destroy(); | 153 PlatformThreadData::current().destroy(); |
152 | 154 |
153 // The thread object may be already destroyed from notification now, don't t ry to access "this". | 155 // The thread object may be already destroyed from notification now, don't t ry to access "this". |
154 detachThread(threadID); | 156 detachThread(threadID); |
155 } | 157 } |
156 | 158 |
157 void WorkerThread::runEventLoop() | 159 void WorkerThread::runEventLoop() |
158 { | 160 { |
159 // Does not return until terminated. | 161 // Does not return until terminated. |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
237 void WorkerThread::releaseFastMallocFreeMemoryInAllThreads() | 239 void WorkerThread::releaseFastMallocFreeMemoryInAllThreads() |
238 { | 240 { |
239 MutexLocker lock(threadSetMutex()); | 241 MutexLocker lock(threadSetMutex()); |
240 HashSet<WorkerThread*>& threads = workerThreads(); | 242 HashSet<WorkerThread*>& threads = workerThreads(); |
241 HashSet<WorkerThread*>::iterator end = threads.end(); | 243 HashSet<WorkerThread*>::iterator end = threads.end(); |
242 for (HashSet<WorkerThread*>::iterator it = threads.begin(); it != end; ++it) | 244 for (HashSet<WorkerThread*>::iterator it = threads.begin(); it != end; ++it) |
243 (*it)->runLoop().postTask(adoptPtr(new ReleaseFastMallocFreeMemoryTask)) ; | 245 (*it)->runLoop().postTask(adoptPtr(new ReleaseFastMallocFreeMemoryTask)) ; |
244 } | 246 } |
245 | 247 |
246 } // namespace WebCore | 248 } // namespace WebCore |
OLD | NEW |