✨ Add the ability to configure the vm service isolate port

Author: fuzzybinary

README.md

@@ -31,6 +31,7 @@ You need
 * git
 * All the things to get Dart source - https://github.com/dart-lang/sdk/wiki/Building#source
 * C++ build tools for your platform (Visual Studio, XCode, gcc, etc)
+* CMake
 
 ## Contributing
 
@@ -45,19 +46,15 @@ This section is as much for my benefit as for yours. Eventually, I hope to make
   * On Windows, these are set with the `setup_env.ps1` script. Specifically, you need to set `GYP_MSVS_OVERRIDE_PATH`, `GYP_MSVS_VERSION`, and `DEPOT_TOOLS_WIN_TOOLCHAIN=0`
 * Builds libdart with:
   ```bash
-  python ./tools/build.py --no-goma -m release libdart
+  # On windows, you will need to add `python` in front
+  ./tools/build.py --no-goma -m release libdart
   ```
 * Revert the changes made to build files to leave a clean copy of the dart-sdk (this makes updating easier)
-* Generate build scripts with genie:
-  ```bash
-  // Windows
-  tools/win/genie.exe vs2022
-  // MacOS
-  ./tools/mac/genie xcode11
-  ```
-* Open the generated build files (in ./.build/projects/[arch_platform]) and build the project.
-* Build.
-* Run one of the examples!
+* Build with CMake:
+```
+cmake -B ./.build .
+cmake --build ./.build
+```
 
 Updating the dart-sdk
 * Make sure environment variables are set (`setup_env.ps1`)

examples/simple_example/main.cpp

@@ -43,7 +43,10 @@ Dart_NativeFunction ResolveNativeFunction(Dart_Handle name,
 
 int main() {
   // Initialize Dart
-  if (!DartDll_Initialize()) {
+  DartDllConfig config;
+  config.service_port = 6222;
+
+  if (!DartDll_Initialize(config)) {
     return -1;
   }
 

examples/simple_example_ffi/main.cpp

@@ -28,7 +28,7 @@ void* ResolveNativeFunction(const char* name, uintptr_t args_n) {
 
 int main() {
   // Initialize Dart
-  if (!DartDll_Initialize()) {
+  if (!DartDll_Initialize(DartDllConfig())) {
     return -1;
   }
 

src/dart_dll.cpp

@@ -13,6 +13,8 @@
 
 using namespace dart::bin;
 
+static DartDllConfig _dart_dll_config;
+
 extern "C" {
 extern const uint8_t kDartVmSnapshotData[];
 extern const uint8_t kDartVmSnapshotInstructions[];
@@ -51,7 +53,8 @@ static Dart_Isolate CreateIsolateGroupAndSetup(const char* script_uri,
                                flags, callback_data, error);
   } else if (0 == strcmp(script_uri, DART_VM_SERVICE_ISOLATE_NAME)) {
     return CreateVmServiceIsolate(script_uri, main, package_root,
-                                  package_config, flags, callback_data, error);
+                                  package_config, flags, callback_data,
+                                  _dart_dll_config.service_port, error);
   } else {
     return CreateIsolate(false, script_uri, main, package_config, flags,
                          callback_data, error);
@@ -102,7 +105,7 @@ static void DeleteIsolateGroupData(void* callback_data) {
 
 extern "C" {
 
-bool DartDll_Initialize() {
+bool DartDll_Initialize(const DartDllConfig& config) {
   std::cout << "Initializig Dart ---- \n";
 
   Dart_SetVMFlags(0, nullptr);
@@ -113,6 +116,9 @@ bool DartDll_Initialize() {
     return false;
   }
 
+  // copy the configuration
+  memcpy(&_dart_dll_config, &config, sizeof(DartDllConfig));
+
   dfe.Init();
   dfe.set_use_dfe();
   dfe.set_use_incremental_compiler(true);

src/dart_dll.h

@@ -15,8 +15,20 @@ typedef struct _Dart_Handle* Dart_Handle;
 
 extern "C" {
 
+struct DartDllConfig {
+  bool start_service_isolate;
+  int service_port;
+
+  DartDllConfig()
+    : start_service_isolate(true)
+    , service_port(5858)
+  {
+    
+  }
+};
+
 // Initialize Dart
-DART_DLL_EXPORT bool DartDll_Initialize();
+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".

src/isolate_setup.cpp

@@ -100,6 +100,7 @@ Dart_Isolate CreateVmServiceIsolate(const char* script_uri,
                                     const char* package_config,
                                     Dart_IsolateFlags* flags,
                                     void* callback_data,
+                                    int service_port,
                                     char** error) {
   IsolateGroupData* isolate_group_data =
       new IsolateGroupData(script_uri, package_config, nullptr, false);
@@ -114,7 +115,7 @@ Dart_Isolate CreateVmServiceIsolate(const char* script_uri,
                                               isolate_group_data, isolate_data};
 
   dart::embedder::VmServiceConfiguration vm_config = {
-      "127.0.0.1", 5858, nullptr, true, true, true};
+      "127.0.0.1", service_port, nullptr, true, true, true};
 
   Dart_Isolate isolate = dart::embedder::CreateVmServiceIsolate(
       data, vm_config, isolate_snapshot_data, isolate_snapshot_instructions,

src/isolate_setup.h

@@ -16,6 +16,7 @@ Dart_Isolate CreateVmServiceIsolate(const char* script_uri,
                                     const char* package_config,
                                     Dart_IsolateFlags* flags,
                                     void* callback_data,
+                                    int service_port,
                                     char** error);
 
 Dart_Isolate CreateIsolate(bool is_main_isolate,