dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "[VM] Temporarily disable DDS for 2.10 branch"

Browse Source 
This reverts commit e498ca00dc.

Reason for revert: 2.10 has been branched.

Original change's description:
> [VM] Temporarily disable DDS for 2.10 branch
> 
> Change-Id: I32916b8e816e109d4e659e9b05326cd0fffb85d7
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/161764
> Commit-Queue: Ben Konyi <bkonyi@google.com>
> Reviewed-by: Devon Carew <devoncarew@google.com>

TBR=devoncarew@google.com,bkonyi@google.com,asiva@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: If895b635fc2f66c08d8b1aa28af92c250de3e95a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/162942
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Ben Konyi <bkonyi@google.com>
This commit is contained in:
Ben Konyi
2020-09-16 18:38:28 +00:00
committed by commit-bot@chromium.org
parent 0eec9ee53c
commit c3da025eaa
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/dartdev/lib/dartdev.dart
+4 -5
View File
@@ -85,11 +85,10 @@ Future<void> runDartdev(List<String> args, SendPort port) async {
orElse: () => null,
);
if (launchDdsArg != null) {
// TODO(bkonyi): uncomment after 2.10 branch.
// RunCommand.launchDds = true;
// final ddsUrl = (launchDdsArg.split('=')[1]).split(':');
// RunCommand.ddsHost = ddsUrl[0];
// RunCommand.ddsPort = ddsUrl[1];
RunCommand.launchDds = true;
final ddsUrl = (launchDdsArg.split('=')[1]).split(':');
RunCommand.ddsHost = ddsUrl[0];
RunCommand.ddsPort = ddsUrl[1];
}
String commandName;
runtime/bin/main.cc
+9 -13
View File
@@ -544,11 +544,8 @@ static Dart_Isolate CreateAndSetupServiceIsolate(const char* script_uri,
result = Dart_SetDeferredLoadHandler(Loader::DeferredLoadHandler);
CHECK_RESULT(result);
// TODO(bkonyi): remove after 2.10 branch.
const bool disable_dds = true;
int vm_service_server_port = INVALID_VM_SERVICE_SERVER_PORT;
if (Options::disable_dart_dev() || disable_dds) {
if (Options::disable_dart_dev()) {
vm_service_server_port = Options::vm_service_server_port();
} else if (Options::vm_service_server_port() !=
INVALID_VM_SERVICE_SERVER_PORT) {
@@ -556,15 +553,14 @@ static Dart_Isolate CreateAndSetupServiceIsolate(const char* script_uri,
}
// Load embedder specific bits and return.
if (!VmService::Setup((Options::disable_dart_dev() || disable_dds)
? Options::vm_service_server_ip()
: DEFAULT_VM_SERVICE_SERVER_IP,
vm_service_server_port, Options::vm_service_dev_mode(),
Options::vm_service_auth_disabled(),
Options::vm_write_service_info_filename(),
Options::trace_loading(), Options::deterministic(),
Options::enable_service_port_fallback(),
!Options::disable_dart_dev() && !disable_dds)) {
if (!VmService::Setup(
Options::disable_dart_dev() ? Options::vm_service_server_ip()
: DEFAULT_VM_SERVICE_SERVER_IP,
vm_service_server_port, Options::vm_service_dev_mode(),
Options::vm_service_auth_disabled(),
Options::vm_write_service_info_filename(), Options::trace_loading(),
Options::deterministic(), Options::enable_service_port_fallback(),
!Options::disable_dart_dev())) {
*error = Utils::StrDup(VmService::GetErrorMessage());
return NULL;
}