Enabled isolate callback data to work

Author: mchandler-plato

src/dart_dll.cpp

@@ -146,17 +146,22 @@ bool DartDll_Initialize(const DartDllConfig& config) {
 }
 
 Dart_Isolate DartDll_LoadScript(const char* script_uri,
-                                const char* package_config) {
+                                const char* package_config,
+								void* callbackPtr) {
   Dart_IsolateFlags isolate_flags;
   Dart_IsolateFlagsInitialize(&isolate_flags);
 
   char* error = nullptr;
   Dart_Isolate isolate = CreateIsolate(true, script_uri, "main", package_config,
-                                       &isolate_flags, nullptr, &error);
+                                       &isolate_flags, callbackPtr, &error);
 
   return isolate;
 }
 
+void* DartDll_GetCallbackData(void* isolate_group_data) {
+  return GetCallbackData(isolate_group_data);
+}
+
 Dart_Handle DartDll_RunMain(Dart_Handle library) {
   Dart_Handle mainClosure =
       Dart_GetField(library, Dart_NewStringFromCString("main"));
@@ -175,7 +180,7 @@ Dart_Handle DartDll_RunMain(Dart_Handle library) {
       Dart_Invoke(isolateLib, Dart_NewStringFromCString("_startMainIsolate"),
                   kNumIsolateArgs, isolateArgs);
   if (Dart_IsError(result)) {
-    std::cout << "Dart initialized, error was: " << Dart_GetError(result)
+    std::cout << "Dart initialized, error was: " << Dart_GetError(result) << "\n"
               << std::endl;
     return result;
   }

src/dart_dll.h

@@ -33,7 +33,11 @@ DART_DLL_EXPORT bool DartDll_Initialize(const DartDllConfig& config);
 // Load a script, with an optional package configuration location. The package
 // configuration is usually in ".dart_tool/package_config.json".
 DART_DLL_EXPORT Dart_Isolate DartDll_LoadScript(const char* script_uri,
-                                        const char* package_config);
+                                                const char* package_config,
+                                                void* callbackPtr = nullptr);
+
+// Gets the pointer provided in DartDll_LoadScript after calling Dart_CurrentIsolateData
+DART_DLL_EXPORT void* DartDll_GetCallbackData(void* isolate_group_data);
 
 // Run "main" from the supplied library, usually one you got from
 // Dart_RootLibrary()

src/isolate_setup.cpp

@@ -17,6 +17,19 @@ extern const uint8_t kDartCoreIsolateSnapshotData[];
 extern const uint8_t kDartCoreIsolateSnapshotInstructions[];
 }
 
+namespace {
+    class DllIsolateGroupData : public IsolateGroupData {
+        public:
+            DllIsolateGroupData(const char* url,
+                const char* packages_file,
+                AppSnapshot* app_snapshot,
+                bool isolate_run_app_snapshot)
+                : IsolateGroupData(url, packages_file, app_snapshot, isolate_run_app_snapshot) {
+            }
+
+            void* callback_data = {};
+    };
+}
 Dart_Handle SetupCoreLibraries(Dart_Isolate isolate,
                                IsolateData* isolate_data,
                                bool is_isolate_group_start,
@@ -63,8 +76,8 @@ Dart_Isolate CreateKernelIsolate(const char* script_uri,
   intptr_t kernel_service_buffer_size = 0;
   dfe.LoadKernelService(&kernel_service_buffer, &kernel_service_buffer_size);
 
-  IsolateGroupData* isolate_group_data =
-      new IsolateGroupData(uri, package_config, nullptr, false);
+  DllIsolateGroupData* isolate_group_data =
+      new DllIsolateGroupData(uri, package_config, nullptr, false);
   isolate_group_data->SetKernelBufferUnowned(
       const_cast<uint8_t*>(kernel_service_buffer), kernel_service_buffer_size);
   IsolateData* isolate_data = new IsolateData(isolate_group_data);
@@ -102,8 +115,8 @@ Dart_Isolate CreateVmServiceIsolate(const char* script_uri,
                                     void* callback_data,
                                     int service_port,
                                     char** error) {
-  IsolateGroupData* isolate_group_data =
-      new IsolateGroupData(script_uri, package_config, nullptr, false);
+  DllIsolateGroupData* isolate_group_data =
+      new DllIsolateGroupData(script_uri, package_config, nullptr, false);
   IsolateData* isolate_data = new IsolateData(isolate_group_data);
 
   flags->load_vmservice_library = true;
@@ -147,10 +160,11 @@ Dart_Isolate CreateIsolate(bool is_main_isolate,
   dfe.ReadScript(script_uri, &kernel_buffer, &kernel_buffer_size);
   flags->null_safety = true;
 
-  IsolateGroupData* isolate_group_data =
-      new IsolateGroupData(script_uri, packages_config, nullptr, false);
+  DllIsolateGroupData* isolate_group_data =
+      new DllIsolateGroupData(script_uri, packages_config, nullptr, false);
   isolate_group_data->SetKernelBufferNewlyOwned(kernel_buffer,
                                                 kernel_buffer_size);
+  isolate_group_data->callback_data = callback_data;
 
   const uint8_t* platform_kernel_buffer = nullptr;
   intptr_t platform_kernel_buffer_size = 0;
@@ -243,3 +257,16 @@ Dart_Isolate CreateIsolate(bool is_main_isolate,
 
   return isolate;
 }
+
+void* GetCallbackData(void* isolate_data) {
+  if (isolate_data == nullptr) {
+    return nullptr;
+  }
+  IsolateGroupData* isolate_group_data = static_cast<IsolateData*>(isolate_data)->isolate_group_data();
+  
+  if (isolate_group_data == nullptr) {
+    return nullptr;
+  }
+  void* callback_data = static_cast<DllIsolateGroupData*>(isolate_group_data)->callback_data;
+  return callback_data;
+}

src/isolate_setup.h

@@ -25,4 +25,6 @@ Dart_Isolate CreateIsolate(bool is_main_isolate,
                            const char* packages_config,
                            Dart_IsolateFlags* flags,
                            void* callback_data,
-                           char** error);
+                           char** error);
+
+void* GetCallbackData(void* isolate_group_data);