Modify the Weak Reference Set creation API to make it easier to create

runtime/vm/dart_api_impl.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 "include/dart_api.h"
 #include "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
@@ skipping 75 matching lines @@
   // If 'size' would be a significant fraction of new space, then use old.
   static const int kExtNewRatio = 16;
   if (size > (heap->CapacityInWords(Heap::kNew) * kWordSize) / kExtNewRatio) {
     return Heap::kOld;
   } else {
     return Heap::kNew;
   }
 }
 
 
+WeakReferenceSetBuilder* ApiState::NewWeakReferenceSetBuilder() {
+  return new WeakReferenceSetBuilder(this);
+}
+
+
+void ApiState::DelayWeakReferenceSet(WeakReferenceSet* reference_set) {
+  WeakReferenceSet::Push(reference_set, &delayed_weak_reference_sets_);
+}
+
+
 Dart_Handle Api::InitNewHandle(Isolate* isolate, RawObject* raw) {
   LocalHandles* local_handles = Api::TopScope(isolate)->local_handles();
   ASSERT(local_handles != NULL);
   LocalHandle* ref = local_handles->AllocateHandle();
   ref->set_raw(raw);
   return reinterpret_cast<Dart_Handle>(ref);
 }
 
 
 Dart_Handle Api::NewHandle(Isolate* isolate, RawObject* raw) {
@@ skipping 629 matching lines @@
 
 
 DART_EXPORT bool Dart_IsPrologueWeakPersistentHandle(
     Dart_WeakPersistentHandle object) {
   FinalizablePersistentHandle* weak_ref =
       FinalizablePersistentHandle::Cast(object);
   return weak_ref->IsPrologueWeakPersistent();
 }
 
 
-DART_EXPORT Dart_Handle Dart_NewWeakReferenceSet(
-    Dart_WeakPersistentHandle* keys,
-    intptr_t num_keys,
-    Dart_WeakPersistentHandle* values,
-    intptr_t num_values) {
+DART_EXPORT Dart_WeakReferenceSetBuilder Dart_NewWeakReferenceSetBuilder() {
   Isolate* isolate = Isolate::Current();
   CHECK_ISOLATE(isolate);
   ApiState* state = isolate->api_state();
   ASSERT(state != NULL);
-  if (keys == NULL) {
-    RETURN_NULL_ERROR(keys);
+  return reinterpret_cast<Dart_WeakReferenceSetBuilder>(
+      state->NewWeakReferenceSetBuilder());
+}
+
+
+DART_EXPORT Dart_WeakReferenceSet Dart_NewWeakReferenceSet(
+    Dart_WeakReferenceSetBuilder set_builder,
+    Dart_WeakPersistentHandle key,
+    Dart_WeakPersistentHandle value) {
+  ASSERT(set_builder != NULL && key != NULL);
+  WeakReferenceSetBuilder* builder =
+      reinterpret_cast<WeakReferenceSetBuilder*>(set_builder);
+  WeakReferenceSet* reference_set = builder->NewWeakReferenceSet();
+  reference_set->AppendKey(key);
+  if (value != NULL) {
+    reference_set->AppendValue(value);
   }
-  if (num_keys <= 0) {
-    return Api::NewError(
-        "%s expects argument 'num_keys' to be greater than 0.",
-        CURRENT_FUNC);
+  return reinterpret_cast<Dart_WeakReferenceSet>(reference_set);
+}
+
+
+DART_EXPORT Dart_Handle Dart_AppendToWeakReferenceSet(
+    Dart_WeakReferenceSet reference_set,
+    Dart_WeakPersistentHandle key,
+    Dart_WeakPersistentHandle value) {
+  ASSERT(reference_set != NULL);
+  WeakReferenceSet* set = reinterpret_cast<WeakReferenceSet*>(reference_set);
+  set->Append(key, value);
+  return Api::Success();
+}
+
+
+DART_EXPORT Dart_Handle Dart_AppendKeyToWeakReferenceSet(
+    Dart_WeakReferenceSet reference_set,
+    Dart_WeakPersistentHandle key) {
+  ASSERT(reference_set != NULL);
+  WeakReferenceSet* set = reinterpret_cast<WeakReferenceSet*>(reference_set);
+  set->AppendKey(key);
+  return Api::Success();
+}
+
+
+DART_EXPORT Dart_Handle Dart_AppendValueToWeakReferenceSet(
+    Dart_WeakReferenceSet reference_set,
+    Dart_WeakPersistentHandle value) {
+  ASSERT(reference_set != NULL);
+  WeakReferenceSet* set = reinterpret_cast<WeakReferenceSet*>(reference_set);
+  set->AppendValue(value);
+  return Api::Success();
+}
+
+
+DART_EXPORT Dart_Handle Dart_RegisterWeakReferenceSet(
+    Dart_WeakReferenceSetBuilder set_builder,
+    Dart_WeakReferenceSet reference_set) {
+  ASSERT(set_builder != NULL);
+  ASSERT(reference_set != NULL);
+  WeakReferenceSet* set = reinterpret_cast<WeakReferenceSet*>(reference_set);
+  if (!set->IsSingleton()) {
+    WeakReferenceSetBuilder* builder =
+        reinterpret_cast<WeakReferenceSetBuilder*>(set_builder);
+    ApiState* state = builder->api_state();
+    ASSERT(state == Isolate::Current()->api_state());
+    state->DelayWeakReferenceSet(set);
   }
-  if (values == NULL) {
-    RETURN_NULL_ERROR(values);
-  }
-  if (num_values <= 0) {
-    return Api::NewError(
-        "%s expects argument 'num_values' to be greater than 0.",
-        CURRENT_FUNC);
-  }
-
-  WeakReferenceSet* reference_set = new WeakReferenceSet(keys, num_keys,
-                                                         values, num_values);
-  state->DelayWeakReferenceSet(reference_set);
   return Api::Success();
 }
 
 
 // --- Garbage Collection Callbacks --
 
 DART_EXPORT Dart_Handle Dart_SetGcCallbacks(
     Dart_GcPrologueCallback prologue_callback,
     Dart_GcEpilogueCallback epilogue_callback) {
   Isolate* isolate = Isolate::Current();
@@ skipping 3928 matching lines @@
 
 
 DART_EXPORT void Dart_RegisterRootServiceRequestCallback(
     const char* name,
     Dart_ServiceRequestCallback callback,
     void* user_data) {
   Service::RegisterRootEmbedderCallback(name, callback, user_data);
 }
 
 }  // namespace dart