Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1681)

Side by Side Diff: Source/core/workers/WorkerThread.cpp

Issue 187483002: Oilpan: We need to collect all garbage before shutting down the worker thread (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/heap/Heap.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 m_workerReportingProxy.workerGlobalScopeStarted(m_workerGlobalScope.get()); 130 m_workerReportingProxy.workerGlobalScopeStarted(m_workerGlobalScope.get());
131 131
132 WorkerScriptController* script = m_workerGlobalScope->script(); 132 WorkerScriptController* script = m_workerGlobalScope->script();
133 InspectorInstrumentation::willEvaluateWorkerScript(workerGlobalScope(), star tMode); 133 InspectorInstrumentation::willEvaluateWorkerScript(workerGlobalScope(), star tMode);
134 script->evaluate(ScriptSourceCode(sourceCode, scriptURL)); 134 script->evaluate(ScriptSourceCode(sourceCode, scriptURL));
135 135
136 runEventLoop(); 136 runEventLoop();
137 137
138 ThreadIdentifier threadID = m_threadID; 138 ThreadIdentifier threadID = m_threadID;
139 139
140 #if !ENABLE_OILPAN
140 ASSERT(m_workerGlobalScope->hasOneRef()); 141 ASSERT(m_workerGlobalScope->hasOneRef());
142 #endif
141 143
142 // The below assignment will destroy the context, which will in turn notify messaging proxy. 144 // The below assignment will destroy the context, which will in turn notify messaging proxy.
143 // We cannot let any objects survive past thread exit, because no other thre ad will run GC or otherwise destroy them. 145 // We cannot let any objects survive past thread exit, because no other thre ad will run GC or otherwise destroy them.
144 m_workerGlobalScope = nullptr; 146 m_workerGlobalScope = nullptr;
145 147
146 // Cleanup thread heap which causes all objects to be finalized. 148 ThreadState::detach();
147 // After this call thread heap must be empty.
148 ThreadState::current()->cleanup();
149 149
150 // Clean up PlatformThreadData before WTF::WTFThreadData goes away! 150 // Clean up PlatformThreadData before WTF::WTFThreadData goes away!
151 PlatformThreadData::current().destroy(); 151 PlatformThreadData::current().destroy();
152 152
153 // The thread object may be already destroyed from notification now, don't t ry to access "this". 153 // The thread object may be already destroyed from notification now, don't t ry to access "this".
154 detachThread(threadID); 154 detachThread(threadID);
155
156 ThreadState::detach();
157 } 155 }
158 156
159 void WorkerThread::runEventLoop() 157 void WorkerThread::runEventLoop()
160 { 158 {
161 // Does not return until terminated. 159 // Does not return until terminated.
162 m_runLoop.run(); 160 m_runLoop.run();
163 } 161 }
164 162
165 class WorkerThreadShutdownFinishTask : public ExecutionContextTask { 163 class WorkerThreadShutdownFinishTask : public ExecutionContextTask {
166 public: 164 public:
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 void WorkerThread::releaseFastMallocFreeMemoryInAllThreads() 246 void WorkerThread::releaseFastMallocFreeMemoryInAllThreads()
249 { 247 {
250 MutexLocker lock(threadSetMutex()); 248 MutexLocker lock(threadSetMutex());
251 HashSet<WorkerThread*>& threads = workerThreads(); 249 HashSet<WorkerThread*>& threads = workerThreads();
252 HashSet<WorkerThread*>::iterator end = threads.end(); 250 HashSet<WorkerThread*>::iterator end = threads.end();
253 for (HashSet<WorkerThread*>::iterator it = threads.begin(); it != end; ++it) 251 for (HashSet<WorkerThread*>::iterator it = threads.begin(); it != end; ++it)
254 (*it)->runLoop().postTask(adoptPtr(new ReleaseFastMallocFreeMemoryTask)) ; 252 (*it)->runLoop().postTask(adoptPtr(new ReleaseFastMallocFreeMemoryTask)) ;
255 } 253 }
256 254
257 } // namespace WebCore 255 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/heap/Heap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698