Oilpan: Prepare moving InspectorController and InspectorAgents to oilpan.

Source/core/inspector/WorkerDebuggerAgent.cpp

 /*
  * Copyright (C) 2011 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 28 matching lines @@
 namespace WebCore {
 
 namespace {
 
 Mutex& workerDebuggerAgentsMutex()
 {
     AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
     return mutex;
 }
 
-typedef HashMap<WorkerThread*, WorkerDebuggerAgent*> WorkerDebuggerAgents;
+typedef HashMap<WorkerThread*, OwnPtr<Persistent<WorkerDebuggerAgent> > > WorkerDebuggerAgents;
 
 WorkerDebuggerAgents& workerDebuggerAgents()
 {
     DEFINE_STATIC_LOCAL(WorkerDebuggerAgents, agents, ());
     return agents;
 }
 
-
 class RunInspectorCommandsTask FINAL : public ScriptDebugServer::Task {
 public:
     explicit RunInspectorCommandsTask(WorkerThread* thread)
         : m_thread(thread) { }
     virtual ~RunInspectorCommandsTask() { }
     virtual void run() OVERRIDE
     {
         // Process all queued debugger commands. WorkerThread is certainly
         // alive if this task is being executed.
         while (MessageQueueMessageReceived == m_thread->runLoop().runDebuggerTask(WorkerRunLoop::DontWaitForMessage)) { }
     }
 
 private:
     WorkerThread* m_thread;
 };
 
 } // namespace
 
-PassOwnPtr<WorkerDebuggerAgent> WorkerDebuggerAgent::create(WorkerScriptDebugServer* scriptDebugServer, WorkerGlobalScope* inspectedWorkerGlobalScope, InjectedScriptManager* injectedScriptManager)
+PassOwnPtrWillBeRawPtr<WorkerDebuggerAgent> WorkerDebuggerAgent::create(WorkerScriptDebugServer* scriptDebugServer, WorkerGlobalScope* inspectedWorkerGlobalScope, InjectedScriptManager* injectedScriptManager)
 {
-    return adoptPtr(new WorkerDebuggerAgent(scriptDebugServer, inspectedWorkerGlobalScope, injectedScriptManager));
+    return adoptPtrWillBeNoop(new WorkerDebuggerAgent(scriptDebugServer, inspectedWorkerGlobalScope, injectedScriptManager));
 }
 
 WorkerDebuggerAgent::WorkerDebuggerAgent(WorkerScriptDebugServer* scriptDebugServer, WorkerGlobalScope* inspectedWorkerGlobalScope, InjectedScriptManager* injectedScriptManager)
     : InspectorDebuggerAgent(injectedScriptManager)
     , m_scriptDebugServer(scriptDebugServer)
     , m_inspectedWorkerGlobalScope(inspectedWorkerGlobalScope)
+    , m_thread(inspectedWorkerGlobalScope->thread())
 {
     MutexLocker lock(workerDebuggerAgentsMutex());
-    workerDebuggerAgents().set(inspectedWorkerGlobalScope->thread(), this);
+    ASSERT(!workerDebuggerAgents().contains(m_thread));
+//#if ENABLE(OILPAN)
+    workerDebuggerAgents().add(m_thread, nullptr/*adoptPtr(new Persistent<WorkerDebuggerAgent>(this))*/);

[keishi, 2014/06/02 12:06:31]

I tried to do the same thing that DatabaseManager  is doing but adding this line
causes this crash. I can't tell what I'm doing wrong. Any ideas?

(lldb) r --debug --no-retry --single-process
inspector/profiler/heap-snapshot-loader.html
Process 18265 launched: '../../out/Debug/Content
Shell.app/Contents/MacOS/Content Shell' (i386)
objc[18265]: Class MockCrApp is implemented in both
/Users/keishi/chromium/src/out/Debug/libblink_web.dylib and
/Users/keishi/chromium/src/out/Debug/Content
Shell.app/Contents/Frameworks/Content Shell Framework.framework/Content Shell
Framework. One of the two will be used. Which one is undefined.
Process 18265 stopped
* thread #1: tid = 0xa3498f, 0x8fe01030 dyld`_dyld_start, stop reason = exec
    frame #0: 0x8fe01030 dyld`_dyld_start
dyld`_dyld_start:
-> 0x8fe01030:  popl   %edx
   0x8fe01031:  pushl  $0x0
   0x8fe01033:  movl   %esp, %ebp
   0x8fe01035:  andl   $-0x10, %esp

[Mads Ager (chromium), 2014/06/03 10:19:35]

I don't use lldb but I think your debugger is playing games with you here. I
have patched in your changes and when running this I get:

Command: 

gdb --args ./out/Debug/content_shell --dump-render-tree --single-process
--no-sandbox -

Crash:

ASSERTION FAILED: !workerDebuggerAgents().contains(m_thread)
../../third_party/WebKit/Source/core/inspector/WorkerDebuggerAgent.cpp(87) :
WebCore::WorkerDebuggerAgent::WorkerDebuggerAgent(WebCore::WorkerScriptDebugServer
*, WebCore::WorkerGlobalScope *, WebCore::InjectedScriptManager *)
1   0x7fffed1a5721
2   0x7fffed1a5619
3   0x7fffed1a7e01
4   0x7fffed279554
5   0x7fffed27228b
6   0x7fffed2721a7
7   0x7fffed272aea
8   0x7fffed286227
9   0x7fffed286115
10  0x7fffe5897ba0
11  0x7fffe5898078
12  0x7fffe6cc2e9a
13  0x7fffe69ef3fd clone

Program received signal SIGSEGV, Segmentation fault.
[Switching to Thread 0x7fffca05e700 (LWP 8531)]
0x00007fffed1a5730 in WebCore::WorkerDebuggerAgent::WorkerDebuggerAgent (
    this=0x7fffca861dc0, scriptDebugServer=0x2e283799fb20, 
    inspectedWorkerGlobalScope=0x7fffca861858, 
    injectedScriptManager=0x1b9f52dd7e80)
    at ../../third_party/WebKit/Source/core/inspector/WorkerDebuggerAgent.cpp:87
87	    ASSERT(!workerDebuggerAgents().contains(m_thread));

That makes a lot of sense because the destructor is not pulling the thread out
of the set. Restoring the destructor removes that assertion failure from this
test.

+//#else
+//    workerDebuggerAgents().set(m_thread, this);
+//#endif
 }
 
 WorkerDebuggerAgent::~WorkerDebuggerAgent()
 {
-    MutexLocker lock(workerDebuggerAgentsMutex());
-    ASSERT(workerDebuggerAgents().contains(m_inspectedWorkerGlobalScope->thread()));
-    workerDebuggerAgents().remove(m_inspectedWorkerGlobalScope->thread());
+    //MutexLocker lock(workerDebuggerAgentsMutex());
+    //ASSERT(workerDebuggerAgents().contains(m_thread));
+    //workerDebuggerAgents().remove(m_thread);
+}
+
+void WorkerDebuggerAgent::trace(Visitor* visitor)
+{
+    visitor->trace(m_inspectedWorkerGlobalScope);
+    InspectorDebuggerAgent::trace(visitor);
 }
 
 void WorkerDebuggerAgent::interruptAndDispatchInspectorCommands(WorkerThread* thread)
 {
     MutexLocker lock(workerDebuggerAgentsMutex());
+#if ENABLE(OILPAN)
+    Persistent<WorkerDebuggerAgent>* agentHandle = workerDebuggerAgents().get(thread);
+    if (!agentHandle)
+        return;
+    WorkerDebuggerAgent* agent = agentHandle->get();
+#else
     WorkerDebuggerAgent* agent = workerDebuggerAgents().get(thread);
+#endif
     if (agent)
         agent->m_scriptDebugServer->interruptAndRunTask(adoptPtr(new RunInspectorCommandsTask(thread)));
 }
 
 void WorkerDebuggerAgent::startListeningScriptDebugServer()
 {
     scriptDebugServer().addListener(this);
 }
 
 void WorkerDebuggerAgent::stopListeningScriptDebugServer()
@@ skipping 19 matching lines @@
 {
     // We don't need to mute console for workers.
 }
 
 void WorkerDebuggerAgent::unmuteConsole()
 {
     // We don't need to mute console for workers.
 }
 
 } // namespace WebCore