| Index: runtime/lib/vmservice.cc
|
| diff --git a/runtime/lib/vmservice.cc b/runtime/lib/vmservice.cc
|
| index 7753bc9cbcd937664da8821e20071b0eaf0a6de3..1f3afd079f5fb31c3b212a807d06f11973bbb529 100644
|
| --- a/runtime/lib/vmservice.cc
|
| +++ b/runtime/lib/vmservice.cc
|
| @@ -8,6 +8,7 @@
|
| #include "vm/exceptions.h"
|
| #include "vm/flags.h"
|
| #include "vm/growable_array.h"
|
| +#include "vm/kernel_isolate.h"
|
| #include "vm/message.h"
|
| #include "vm/message_handler.h"
|
| #include "vm/native_entry.h"
|
| @@ -16,7 +17,6 @@
|
| #include "vm/service_event.h"
|
| #include "vm/service_isolate.h"
|
| #include "vm/symbols.h"
|
| -#include "vm/kernel_isolate.h"
|
|
|
| namespace dart {
|
|
|
| @@ -34,7 +34,6 @@ static void malloc_deallocator(uint8_t* ptr) {
|
| free(reinterpret_cast<void*>(ptr));
|
| }
|
|
|
| -
|
| #ifndef PRODUCT
|
| class RegisterRunningIsolatesVisitor : public IsolateVisitor {
|
| public:
|
| @@ -118,7 +117,6 @@ DEFINE_NATIVE_ENTRY(VMService_SendIsolateServiceMessage, 2) {
|
| return Bool::Get(result).raw();
|
| }
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(VMService_SendRootServiceMessage, 1) {
|
| GET_NON_NULL_NATIVE_ARGUMENT(Array, message, arguments->NativeArgAt(0));
|
| if (FLAG_support_service) {
|
| @@ -127,7 +125,6 @@ DEFINE_NATIVE_ENTRY(VMService_SendRootServiceMessage, 1) {
|
| return Object::null();
|
| }
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(VMService_SendObjectRootServiceMessage, 1) {
|
| GET_NON_NULL_NATIVE_ARGUMENT(Array, message, arguments->NativeArgAt(0));
|
| if (FLAG_support_service) {
|
| @@ -136,7 +133,6 @@ DEFINE_NATIVE_ENTRY(VMService_SendObjectRootServiceMessage, 1) {
|
| return Object::null();
|
| }
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(VMService_OnStart, 0) {
|
| if (FLAG_trace_service) {
|
| OS::Print("vm-service: Booting dart:vmservice library.\n");
|
| @@ -157,7 +153,6 @@ DEFINE_NATIVE_ENTRY(VMService_OnStart, 0) {
|
| return Object::null();
|
| }
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(VMService_OnExit, 0) {
|
| if (FLAG_trace_service) {
|
| OS::Print("vm-service: processed exit message.\n");
|
| @@ -168,7 +163,6 @@ DEFINE_NATIVE_ENTRY(VMService_OnExit, 0) {
|
| return Object::null();
|
| }
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(VMService_OnServerAddressChange, 1) {
|
| if (!FLAG_support_service) {
|
| return Object::null();
|
| @@ -182,7 +176,6 @@ DEFINE_NATIVE_ENTRY(VMService_OnServerAddressChange, 1) {
|
| return Object::null();
|
| }
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(VMService_ListenStream, 1) {
|
| GET_NON_NULL_NATIVE_ARGUMENT(String, stream_id, arguments->NativeArgAt(0));
|
| bool result = false;
|
| @@ -192,7 +185,6 @@ DEFINE_NATIVE_ENTRY(VMService_ListenStream, 1) {
|
| return Bool::Get(result).raw();
|
| }
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(VMService_CancelStream, 1) {
|
| GET_NON_NULL_NATIVE_ARGUMENT(String, stream_id, arguments->NativeArgAt(0));
|
| if (FLAG_support_service) {
|
| @@ -201,7 +193,6 @@ DEFINE_NATIVE_ENTRY(VMService_CancelStream, 1) {
|
| return Object::null();
|
| }
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(VMService_RequestAssets, 0) {
|
| if (!FLAG_support_service) {
|
| return Object::null();
|
| @@ -209,7 +200,6 @@ DEFINE_NATIVE_ENTRY(VMService_RequestAssets, 0) {
|
| return Service::RequestAssets();
|
| }
|
|
|
| -
|
| #ifndef PRODUCT
|
| // TODO(25041): When reading, this class copies out the filenames and contents
|
| // into new buffers. It does this because the lifetime of |bytes| is uncertain.
|
| @@ -373,7 +363,6 @@ class TarArchive {
|
| DISALLOW_COPY_AND_ASSIGN(TarArchive);
|
| };
|
|
|
| -
|
| static void ContentsFinalizer(void* isolate_callback_data,
|
| Dart_WeakPersistentHandle handle,
|
| void* peer) {
|
| @@ -381,16 +370,13 @@ static void ContentsFinalizer(void* isolate_callback_data,
|
| delete[] data;
|
| }
|
|
|
| -
|
| static void FilenameFinalizer(void* peer) {
|
| char* filename = reinterpret_cast<char*>(peer);
|
| delete[] filename;
|
| }
|
|
|
| -
|
| #endif
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(VMService_DecodeAssets, 1) {
|
| #ifndef PRODUCT
|
| if (!FLAG_support_service) {
|
| @@ -447,7 +433,6 @@ DEFINE_NATIVE_ENTRY(VMService_DecodeAssets, 1) {
|
| #endif
|
| }
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(VMService_spawnUriNotify, 2) {
|
| #ifndef PRODUCT
|
| if (!FLAG_support_service) {
|
|
|