Enable VM service inside Dartium Renderer processes

Source/bindings/dart/DartController.cpp

 // Copyright (c) 2009, 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 18 matching lines @@
 
 #include "config.h"
 #include "bindings/dart/DartController.h"
 
 #if OS(ANDROID)
 #include <sys/system_properties.h>
 #endif
 
 
 #include "DartDocument.h"
+#include "DartService.h"
 #include "DartWindow.h"
 #include "HTMLNames.h"
 #include "bindings/dart/DartApplicationLoader.h"
 #include "bindings/dart/DartAsyncLoader.h"
 #include "bindings/dart/DartDOMData.h"
 #include "bindings/dart/DartDOMWrapper.h"
 #include "bindings/dart/DartDebugServer.h"
 #include "bindings/dart/DartGCController.h"
 #include "bindings/dart/DartIsolateDestructionObserver.h"
 #include "bindings/dart/DartJsInterop.h"
@@ skipping 176 matching lines @@
 void DartController::createDOMEnabledIsolateIfNeeded(const String& scriptURL, const String& entryPoint, Document* document)
 {
     if (m_isolate) {
         Dart_EnterIsolate(m_isolate);
         return;
     }
     // FIXME: proper error reporting.
     char* errorMessage = 0;
     m_isolate = createIsolate(scriptURL.utf8().data(), entryPoint.utf8().data(), document, true, &errorMessage);
     ASSERT(m_isolate);
+    ASSERT(Dart_CurrentIsolate() == m_isolate);

[Jacob, 2013/12/04 20:39:52]

why is this assert here?

[Cutch, 2013/12/04 21:20:50]

It was just verifying my assumption. Removed.

+    Dart_ExitIsolate();
+
+    bool r = DartService::Start(document);

[Jacob, 2013/12/04 20:39:52]

can you add a flag that controls whether the DartService is turned on?
We shouldn't check this in with the service on 100% of the time.

[Cutch, 2013/12/04 21:20:50]

Done.

+    ASSERT(r);
+    ASSERT(Dart_CurrentIsolate());
+
+    Dart_EnterIsolate(m_isolate);

[siva, 2013/12/13 21:48:22]

Why not move the EnterScope/ExitScope stuff to SendIsolateStartupMessage().

Also use DartApiScope instead of the Enter/Exit stuff.

+    Dart_EnterScope();
+    DartService::SendIsolateStartupMessage();
+    Dart_ExitScope();
+
+    {
+        // The following is only used for testing and will be removed.

[Jacob, 2013/12/04 20:39:52]

add a fixme for code that should be removed.

[Cutch, 2013/12/04 21:20:50]

Done.

+        Dart_EnterScope();
+        Dart_Handle html =
+            Dart_LookupLibrary(Dart_NewStringFromCString("dart:html"));
+        ASSERT(!Dart_IsError(html));
+        Dart_Handle res = Dart_SetField(html,
+            Dart_NewStringFromCString("myPort"),
+            Dart_NewSendPort(DartService::GetRequestPort()));
+        ASSERT(!Dart_IsError(res));
+        Dart_ExitScope();
+    }
 }
 
 void DartController::shutdownIsolate(Dart_Isolate isolate)
 {
     DartDOMData* domData = DartDOMData::current();
     ASSERT(domData->isDOMEnabled());
     // If the following assert triggers, we have hit dartbug.com/14183
     // FIXME: keep the isolate alive until the recursion level is 0.
     ASSERT(!*(domData->recursion()));
     DartDebugServer::shared().unregisterIsolate(isolate);
@@ skipping 38 matching lines @@
 
     // Due to synchronous dispatch, we may be in an isolate corresponding to another frame.
     // If so, save and restore.
     Dart_Isolate currentIsolate = Dart_CurrentIsolate();
     if (currentIsolate)
         Dart_ExitIsolate();
 
     if (m_isolate) {
         Dart_EnterIsolate(m_isolate);
         DartUtilities::disposeWeakPersistentHandles();
-
         shutdownIsolate(m_isolate);
         m_isolate = 0;
     }
 
     for (ScriptStatesMap::iterator it = m_scriptStates.begin(); it != m_scriptStates.end(); ++it) {
         LibraryIdMap* libraryIdMap = it->value;
         for (LibraryIdMap::iterator scriptStateIt = libraryIdMap->begin(); scriptStateIt != libraryIdMap->end(); ++scriptStateIt) {
             delete scriptStateIt->value;
         }
         delete libraryIdMap;
@@ skipping 102 matching lines @@
     if (parentDOMData->isDOMEnabled() && !isSpawnUri) {
         // spawnFunction is not allowed from a DOM enabled isolate.
         // This triggers an exception in the caller.
         *errorMsg = strdup("spawnFunction is not supported from a dom-enabled isolate. Please use spawnUri instead.");
         return 0;
     }
 
     ASSERT(context->isDocument());
     Document* document = static_cast<Document*>(context);
 
     Dart_Isolate isolate = createIsolate(scriptURL, entryPoint, document, false, errorMsg);

[siva, 2013/12/13 21:48:22]

Ditto comment about Enter/Exit Scope

+    Dart_EnterScope();
+    DartService::SendIsolateStartupMessage();

[Jacob, 2013/12/04 20:39:52]

put enterscope, exit scope in
{

} 
by convention
or at least add whitespace

[Cutch, 2013/12/04 21:20:50]

Done.

+    Dart_ExitScope();
     if (!isolate) {
         // This triggers an exception in the caller.
         *errorMsg = strdup("Isolate spawn failed.");
         return 0;
     }
 
     // FIXME: If a spawnFunction, we should not need to request resources again. But, it's not clear
     // we need this callback in the first place for spawnFunction.
 
     // We need to request the sources asynchronously.
@@ skipping 115 matching lines @@
         return true;
     }
     return false;
 }
 
 void DartController::initVMIfNeeded()
 {
     static bool hasBeenInitialized = false;
     if (hasBeenInitialized)
         return;
-
     char flagsProp[DartUtilities::PROP_VALUE_MAX_LEN];
     int propLen = DartUtilities::getProp(
         "DART_FLAGS", flagsProp, DartUtilities::PROP_VALUE_MAX_LEN);
     if (propLen > 0) {
         setDartFlags(flagsProp);
     } else {
         setDartFlags(0);
     }
 
     // FIXME(antonm): implement proper shutdown callback.
     // FIXME(antonm): implement proper unhandled exception callback.
-    Dart_Initialize(&createPureIsolateCallback, 0, 0, 0, openFileCallback, readFileCallback, writeFileCallback, closeFileCallback, generateEntropy);
+    Dart_Initialize(&createPureIsolateCallback, 0, 0, DartService::VmServiceShutdownCallback, openFileCallback, readFileCallback, writeFileCallback, closeFileCallback, generateEntropy);

[siva, 2013/12/13 21:48:22]

You should have a  generic shutdown callback and inside of that call
DartService::VmServiceShutdownCallback if it is the VM service Isolate.

     hasBeenInitialized = true;
 }
 
 static bool checkForExpiration()
 {
     const time_t ExpirationTimeSecsSinceEpoch =
 #include "bindings/dart/ExpirationTimeSecsSinceEpoch.time_t"
     ;
     const char* override = getenv("DARTIUM_EXPIRATION_TIME");
     time_t expiration;
@@ skipping 261 matching lines @@
         Dart_Handle libraryIdHandle = Dart_ListGetAt(libraryIdList, i);
         Dart_Handle exception = 0;
         intptr_t libraryId = DartUtilities::toInteger(libraryIdHandle, exception);
         ASSERT(!exception);
         DartScriptState* scriptState = lookupScriptStateFromLibraryIdMap(isolate, v8Context, libraryIdMap, libraryId);
         result.append(scriptState);
     }
 }
 
 }