DevFS initial implementation

runtime/vm/json_stream.cc

 // Copyright (c) 2013, 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 "platform/assert.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/json_stream.h"
 #include "vm/message.h"
@@ skipping 28 matching lines @@
 
 DECLARE_FLAG(bool, trace_service);
 
 JSONStream::JSONStream(intptr_t buf_size)
     : open_objects_(0),
       buffer_(buf_size),
       default_id_zone_(),
       id_zone_(&default_id_zone_),
       reply_port_(ILLEGAL_PORT),
       seq_(NULL),
+      parameter_keys_(NULL),
+      parameter_values_(NULL),
       method_(""),
       param_keys_(NULL),
       param_values_(NULL),
       num_params_(0),
       offset_(0),
       count_(-1) {
   ObjectIdRing* ring = NULL;
   Isolate* isolate = Isolate::Current();
   if (isolate != NULL) {
     ring = isolate->object_id_ring();
   }
   default_id_zone_.Init(ring, ObjectIdRing::kAllocateId);
 }
 
 
 JSONStream::~JSONStream() {
 }
 
 
 void JSONStream::Setup(Zone* zone,
                        Dart_Port reply_port,
                        const Instance& seq,
                        const String& method,
                        const Array& param_keys,
-                       const Array& param_values) {
+                       const Array& param_values,
+                       bool parameters_are_dart_objects) {
   set_reply_port(reply_port);
   seq_ = &Instance::ZoneHandle(seq.raw());
   method_ = method.ToCString();
 
-  String& string_iterator = String::Handle();
-  if (param_keys.Length() > 0) {
+  if (parameters_are_dart_objects) {
+    parameter_keys_ = &Array::ZoneHandle(param_keys.raw());
+    parameter_values_ = &Array::ZoneHandle(param_values.raw());
+    ASSERT(parameter_keys_->Length() == parameter_values_->Length());
+  } else if (param_keys.Length() > 0) {
+    String& string_iterator = String::Handle();
     ASSERT(param_keys.Length() == param_values.Length());
     const char** param_keys_native =
         zone->Alloc<const char*>(param_keys.Length());
     const char** param_values_native =
         zone->Alloc<const char*>(param_keys.Length());
     for (intptr_t i = 0; i < param_keys.Length(); i++) {
+      // fprintf(stderr, "Param %" Pd " is %s\n", i, param_values[

[turnidge, 2016/06/10 18:45:34]

Remove this.

       string_iterator ^= param_keys.At(i);
       param_keys_native[i] =
           zone->MakeCopyOfString(string_iterator.ToCString());
       string_iterator ^= param_values.At(i);
       param_values_native[i] =
           zone->MakeCopyOfString(string_iterator.ToCString());
     }
     SetParams(param_keys_native, param_values_native, param_keys.Length());
   }
+
   if (FLAG_trace_service) {
     Isolate* isolate = Isolate::Current();
     ASSERT(isolate != NULL);
     const char* isolate_name = isolate->name();
     setup_time_micros_ = OS::GetCurrentTimeMicros();
     OS::Print("[+%" Pd64 "ms] Isolate %s processing service request %s\n",
               Dart::timestamp(), isolate_name, method_);
   }
   buffer_.Printf("{\"jsonrpc\":\"2.0\", \"result\":");
 }
@@ skipping 18 matching lines @@
     case kInternalError:
       return "Internal error";
     case kFeatureDisabled:
       return "Feature is disabled";
     case kCannotAddBreakpoint:
       return "Cannot add breakpoint";
     case kIsolateMustBeRunnable:
       return "Isolate must be runnable";
     case kIsolateMustBePaused:
       return "Isolate must be paused";
+    case kIsolateIsReloading:
+      return "Isolate is reloading";
+    case kFileSystemAlreadyExists:
+      return "File system already exists";
+    case kFileSystemDoesNotExist:
+      return "File system does not exist";
+    case kFileDoesNotExist:
+      return "File does not exist";
     default:
       return "Extension error";
   }
 }
 
 
 static void PrintRequest(JSONObject* obj, JSONStream* js) {
   JSONObject jsobj(obj, "request");
   jsobj.AddProperty("method", js->method());
   {
@@ skipping 517 matching lines @@
   *buffer_length = buffer_.length();
   *buffer = buffer_.Steal();
 }
 
 
 void JSONStream::set_reply_port(Dart_Port port) {
   reply_port_ = port;
 }
 
 
+intptr_t JSONStream::NumObjectParameters() const {
+  if (parameter_keys_ == NULL) {
+    return 0;
+  }
+  ASSERT(parameter_keys_ != NULL);
+  ASSERT(parameter_values_ != NULL);
+  return parameter_keys_->Length();
+}
+
+
+RawObject* JSONStream::GetObjectParameterKey(intptr_t i) const {
+  ASSERT((i >= 0) && (i < NumObjectParameters()));
+  return parameter_keys_->At(i);
+}
+
+
+RawObject* JSONStream::GetObjectParameterValue(intptr_t i) const {
+  ASSERT((i >= 0) && (i < NumObjectParameters()));
+  return parameter_values_->At(i);
+}
+
+
+RawObject* JSONStream::LookupObjectParam(const char* c_key) const {
+  const String& key = String::Handle(String::New(c_key));
+  Object& test = Object::Handle();
+  const intptr_t num_object_parameters = NumObjectParameters();
+  for (intptr_t i = 0; i < num_object_parameters; i++) {
+    test = GetObjectParameterKey(i);
+    if (test.IsString() && String::Cast(test).Equals(key)) {
+      return GetObjectParameterValue(i);
+    }
+  }
+  return Object::null();
+}
+
+
 void JSONStream::SetParams(const char** param_keys,
                            const char** param_values,
                            intptr_t num_params) {
   param_keys_ = param_keys;
   param_values_ = param_values;
   num_params_ = num_params;
 }
 
 
 void JSONStream::PrintProperty(const char* name, const Object& o, bool ref) {
@@ skipping 211 matching lines @@
   ASSERT(len == len2);
   stream_->buffer_.AddChar('"');
   stream_->AddEscapedUTF8String(p);
   stream_->buffer_.AddChar('"');
   free(p);
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart