Oilpan: Prepare moving InspectorController and InspectorAgents to oilpan.

Source/core/workers/WorkerThread.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 12 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #include "config.h"
 
 #include "core/workers/WorkerThread.h"
 
 #include "bindings/v8/ScriptSourceCode.h"
 #include "core/inspector/InspectorInstrumentation.h"
+#include "core/inspector/WorkerDebuggerAgent.h"
+#include "core/inspector/WorkerInspectorController.h"
 #include "core/workers/DedicatedWorkerGlobalScope.h"
 #include "core/workers/WorkerClients.h"
 #include "core/workers/WorkerReportingProxy.h"
 #include "core/workers/WorkerThreadStartupData.h"
 #include "platform/PlatformThreadData.h"
 #include "platform/heap/ThreadState.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebWaitableEvent.h"
 #include "public/platform/WebWorkerRunLoop.h"
@@ skipping 52 matching lines @@
     m_threadID = createThread(WorkerThread::workerThreadStart, this, "WebCore: Worker");
 
     return m_threadID;
 }
 
 void WorkerThread::workerThreadStart(void* thread)
 {
     static_cast<WorkerThread*>(thread)->workerThread();
 }
 
+void WorkerThread::interruptAndDispatchInspectorCommands()
+{
+    MutexLocker locker(m_threadShutdownMutex);
+    if (!m_workerGlobalScope)
+        return;
+    WorkerInspectorController* inspectorController = m_workerGlobalScope->workerInspectorController();
+    if (!inspectorController)
+        return;
+    if (WorkerDebuggerAgent* debuggerAgent = inspectorController->workerDebuggerAgent())

[yurys, 2014/06/25 06:11:23]

This check should always be true as the agent is cleared only when disposing of
WorkerInspectorController.

+        debuggerAgent->interruptAndDispatchInspectorCommands(this);
+}
+
 void WorkerThread::workerThread()
 {
     KURL scriptURL = m_startupData->m_scriptURL;
     String sourceCode = m_startupData->m_sourceCode;
     WorkerThreadStartMode startMode = m_startupData->m_startMode;
-
     {
         MutexLocker lock(m_threadCreationMutex);
         ThreadState::attach();
         m_workerGlobalScope = createWorkerGlobalScope(m_startupData.release());
         m_runLoop.setWorkerGlobalScope(workerGlobalScope());
 
         if (m_runLoop.terminated()) {
             // The worker was terminated before the thread had a chance to run. Since the context didn't exist yet,
             // forbidExecution() couldn't be called from stop().
             m_workerGlobalScope->script()->forbidExecution();
@@ skipping 12 matching lines @@
     InspectorInstrumentation::willEvaluateWorkerScript(workerGlobalScope(), startMode);
     script->evaluate(ScriptSourceCode(sourceCode, scriptURL));
 
     runEventLoop();
 
     // This should be called before we start the shutdown procedure.
     workerReportingProxy().willDestroyWorkerGlobalScope();
 
     ThreadIdentifier threadID = m_threadID;
 
-    // The below assignment will destroy the context, which will in turn notify messaging proxy.
-    // We cannot let any objects survive past thread exit, because no other thread will run GC or otherwise destroy them.
-    // If Oilpan is enabled, we detach of the context/global scope, with the final heap cleanup below sweeping it out.
+    {
+        MutexLocker locker(m_threadShutdownMutex);
+        // The below assignment will destroy the context, which will in turn notify messaging proxy.
+        // We cannot let any objects survive past thread exit, because no other thread will run GC or otherwise destroy them.
+        // If Oilpan is enabled, we detach of the context/global scope, with the final heap cleanup below sweeping it out.
 #if !ENABLE(OILPAN)
-    ASSERT(m_workerGlobalScope->hasOneRef());
+        ASSERT(m_workerGlobalScope->hasOneRef());
 #endif
-    m_workerGlobalScope->dispose();
-    m_workerGlobalScope = nullptr;
+        m_workerGlobalScope->dispose();
+        m_workerGlobalScope = nullptr;
+    }
 
     // Detach the ThreadState, cleaning out the thread's heap by
     // performing a final GC. The cleanup operation will at the end
     // assert that the heap is empty. If the heap does not become
     // empty, there are still pointers into the heap and those
     // pointers will be dangling after thread termination because we
     // are destroying the heap. It is important to detach while the
     // thread is still valid. In particular, finalizers for objects in
     // the heap for this thread will need to access thread local data.
     ThreadState::detach();
@@ skipping 79 matching lines @@
     }
     m_runLoop.terminate();
 }
 
 bool WorkerThread::isCurrentThread() const
 {
     return m_threadID == currentThread();
 }
 
 } // namespace WebCore