Redo allocationprofile options

runtime/vm/service.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 "vm/service.h"
 
 #include "include/dart_api.h"
 #include "platform/globals.h"
 
 #include "vm/compiler.h"
@@ skipping 1443 matching lines @@
   return true;
 }
 
 static bool HandleCoverage(Isolate* isolate, JSONStream* js) {
   CodeCoverage::PrintToJSONStream(isolate, js);
   return true;
 }
 
 
 static bool HandleAllocationProfile(Isolate* isolate, JSONStream* js) {
-  if (js->num_arguments() == 2) {
-    const char* sub_command = js->GetArgument(1);
-    if (!strcmp(sub_command, "reset")) {
-      isolate->class_table()->ResetAllocationAccumulators();
-      isolate->class_table()->AllocationProfilePrintToJSONStream(js);
-      return true;
-    } else if (!strcmp(sub_command, "fullgc")) {
-      isolate->heap()->CollectAllGarbage();
-      isolate->class_table()->AllocationProfilePrintToJSONStream(js);
-      return true;
-    } else {
-      PrintError(js, "Unrecognized subcommand '%s'", sub_command);
-      return true;
-    }
-  }
+  bool should_reset_accumulator = false;
+  bool should_collect = false;
   if (js->num_arguments() != 1) {
     PrintError(js, "Command too long");
     return true;
   }
+  if (js->HasOption("reset")) {
+    if (js->OptionIs("reset", "true")) {
+      should_reset_accumulator = true;
+    } else {
+      PrintError(js, "Unrecognized reset option '%s'",
+                 js->LookupOption("reset"));
+      return true;
+    }
+  }
+  if (js->HasOption("gc")) {
+    if (js->OptionIs("gc", "full")) {
+      should_collect = true;
+    } else {
+      PrintError(js, "Unrecognized gc option '%s'", js->LookupOption("gc"));
+      return true;
+    }
+  }
+  if (should_reset_accumulator) {
+    isolate->class_table()->ResetAllocationAccumulators();
+  }
+  if (should_collect) {
+    isolate->heap()->CollectAllGarbage();
+  }
   isolate->class_table()->AllocationProfilePrintToJSONStream(js);
   return true;
 }
 
 
 static bool HandleResume(Isolate* isolate, JSONStream* js) {
   if (isolate->message_handler()->pause_on_start()) {
     isolate->message_handler()->set_pause_on_start(false);
     JSONObject jsobj(js);
     jsobj.AddProperty("type", "Success");
@@ skipping 393 matching lines @@
   while (current != NULL) {
     if (strcmp(name, current->name()) == 0) {
       return current;
     }
     current = current->next();
   }
   return NULL;
 }
 
 }  // namespace dart