96ff3276f4
Work towards https://github.com/flutter/flutter/issues/46724 Background: on the latest versions of iOS today, we have to use mdns to discover the observatory port and authentication code. For a variety of reasons this can fail, leaving us with no way to connect. An alternative approach is to specify the observatory port and disable the authentication code. If binding to this port fails, however, we would still like to attempt connecting with mdns. Overview: This adds a new flag to the dart SDK, --enable-service-port-fallback. This amends the behavior of the vmservice with a specified port. After failing to bind 3 times to a non-zero port, update the port selection to 0. Results: Tested locally two dart VMs with the same specified port: ``` jonahwilliams@jonahwilliams0:~/Documents/engine/src/out/host_debug_unopt$ ./dart --enable-service-port-fallback --observe=8080 example.dart Observatory server failed to start after 1 tries Falling back to automatic port selection vm-service: isolate(2785434094928835) 'main' has no debugger attached and is paused at exit. Connect to Observatory to debug. Observatory listening on http://127.0.0.1:45663/62A5IHjmv9E=/ ``` Change-Id: I582ab402a457330928e5b490f9718fcd52b56720 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/133434 Reviewed-by: Ben Konyi <bkonyi@google.com> Commit-Queue: Jonah Williams <jonahwilliams@google.com>
141 lines
4.6 KiB
C++
141 lines
4.6 KiB
C++
// Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file
|
|
// for details. All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
#include "include/dart_embedder_api.h"
|
|
|
|
#include "bin/dartutils.h"
|
|
#include "bin/eventhandler.h"
|
|
#include "bin/isolate_data.h"
|
|
#include "bin/thread.h"
|
|
#include "bin/utils.h"
|
|
#include "bin/vmservice_impl.h"
|
|
|
|
namespace dart {
|
|
namespace embedder {
|
|
|
|
static char* MallocFormatedString(const char* format, ...) {
|
|
va_list args;
|
|
va_start(args, format);
|
|
intptr_t len = vsnprintf(NULL, 0, format, args);
|
|
va_end(args);
|
|
|
|
char* buffer = reinterpret_cast<char*>(malloc(len + 1));
|
|
MSAN_UNPOISON(buffer, (len + 1));
|
|
va_list args2;
|
|
va_start(args2, format);
|
|
vsnprintf(buffer, (len + 1), format, args2);
|
|
va_end(args2);
|
|
return buffer;
|
|
}
|
|
|
|
bool InitOnce(char** error) {
|
|
if (!bin::DartUtils::SetOriginalWorkingDirectory()) {
|
|
bin::OSError err;
|
|
*error = MallocFormatedString("Error determining current directory: %s\n",
|
|
err.message());
|
|
return false;
|
|
}
|
|
bin::TimerUtils::InitOnce();
|
|
bin::EventHandler::Start();
|
|
return true;
|
|
}
|
|
|
|
Dart_Isolate CreateKernelServiceIsolate(const IsolateCreationData& data,
|
|
const uint8_t* buffer,
|
|
intptr_t buffer_size,
|
|
char** error) {
|
|
Dart_Isolate kernel_isolate = Dart_CreateIsolateGroupFromKernel(
|
|
data.script_uri, data.main, buffer, buffer_size, data.flags,
|
|
data.isolate_group_data, data.isolate_data, error);
|
|
if (kernel_isolate == nullptr) {
|
|
return nullptr;
|
|
}
|
|
|
|
Dart_EnterScope();
|
|
Dart_Handle result = Dart_LoadScriptFromKernel(buffer, buffer_size);
|
|
if (Dart_IsError(result)) {
|
|
*error = strdup(Dart_GetError(result));
|
|
Dart_ExitScope();
|
|
Dart_ShutdownIsolate();
|
|
return nullptr;
|
|
}
|
|
result = bin::DartUtils::PrepareForScriptLoading(/*is_service_isolate=*/false,
|
|
/*trace_loading=*/false);
|
|
Dart_ExitScope();
|
|
Dart_ExitIsolate();
|
|
return kernel_isolate;
|
|
}
|
|
|
|
Dart_Isolate CreateVmServiceIsolate(const IsolateCreationData& data,
|
|
const VmServiceConfiguration& config,
|
|
const uint8_t* isolate_data,
|
|
const uint8_t* isolate_instr,
|
|
char** error) {
|
|
if (data.flags == nullptr) {
|
|
*error = strdup("Expected non-null flags");
|
|
return nullptr;
|
|
}
|
|
data.flags->load_vmservice_library = true;
|
|
|
|
Dart_Isolate service_isolate = Dart_CreateIsolateGroup(
|
|
data.script_uri, data.main, isolate_data, isolate_instr, data.flags,
|
|
data.isolate_group_data, data.isolate_data, error);
|
|
if (service_isolate == nullptr) {
|
|
return nullptr;
|
|
}
|
|
|
|
Dart_EnterScope();
|
|
// Load embedder specific bits and return.
|
|
if (!bin::VmService::Setup(config.ip, config.port, config.dev_mode,
|
|
config.disable_auth_codes,
|
|
config.write_service_info_filename,
|
|
/*trace_loading=*/false, config.deterministic,
|
|
/*enable_service_port_fallback=*/false)) {
|
|
*error = strdup(bin::VmService::GetErrorMessage());
|
|
return nullptr;
|
|
}
|
|
|
|
Dart_ExitScope();
|
|
Dart_ExitIsolate();
|
|
return service_isolate;
|
|
}
|
|
|
|
Dart_Isolate CreateVmServiceIsolateFromKernel(
|
|
const IsolateCreationData& data,
|
|
const VmServiceConfiguration& config,
|
|
const uint8_t* kernel_buffer,
|
|
intptr_t kernel_buffer_size,
|
|
char** error) {
|
|
if (data.flags == nullptr) {
|
|
*error = strdup("Expected non-null flags");
|
|
return nullptr;
|
|
}
|
|
data.flags->load_vmservice_library = true;
|
|
|
|
Dart_Isolate service_isolate = Dart_CreateIsolateGroupFromKernel(
|
|
data.script_uri, data.main, kernel_buffer, kernel_buffer_size, data.flags,
|
|
data.isolate_group_data, data.isolate_data, error);
|
|
if (service_isolate == nullptr) {
|
|
return nullptr;
|
|
}
|
|
|
|
Dart_EnterScope();
|
|
// Load embedder specific bits and return.
|
|
if (!bin::VmService::Setup(config.ip, config.port, config.dev_mode,
|
|
config.disable_auth_codes,
|
|
config.write_service_info_filename,
|
|
/*trace_loading=*/false, config.deterministic,
|
|
/*enable_service_port_fallback=*/false)) {
|
|
*error = strdup(bin::VmService::GetErrorMessage());
|
|
return nullptr;
|
|
}
|
|
|
|
Dart_ExitScope();
|
|
Dart_ExitIsolate();
|
|
return service_isolate;
|
|
}
|
|
|
|
} // namespace embedder
|
|
} // namespace dart
|