Revert r32930 (Add more timing information in the VM to track time...)

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 158 matching lines @@
 }
 
 
 Dart_Isolate Api::CastIsolate(Isolate* isolate) {
   return reinterpret_cast<Dart_Isolate>(isolate);
 }
 
 
 Dart_Handle Api::NewError(const char* format, ...) {
   Isolate* isolate = Isolate::Current();
-  HANDLESCOPE(isolate);
+  DARTSCOPE(isolate);
   CHECK_CALLBACK_STATE(isolate);
 
   va_list args;
   va_start(args, format);
   intptr_t len = OS::VSNPrint(NULL, 0, format, args);
   va_end(args);
 
   char* buffer = isolate->current_zone()->Alloc<char>(len + 1);
   va_list args2;
   va_start(args2, format);
@@ skipping 679 matching lines @@
 DART_EXPORT Dart_Isolate Dart_CreateIsolate(const char* script_uri,
                                             const char* main,
                                             const uint8_t* snapshot,
                                             void* callback_data,
                                             char** error) {
   TRACE_API_CALL(CURRENT_FUNC);
   char* isolate_name = BuildIsolateName(script_uri, main);
   Isolate* isolate = Dart::CreateIsolate(isolate_name);
   free(isolate_name);
   {
-    START_TIMER(isolate, time_total_runtime);
     StackZone zone(isolate);
     HANDLESCOPE(isolate);
     const Error& error_obj =
         Error::Handle(isolate,
                       Dart::InitializeIsolate(snapshot, callback_data));
     if (error_obj.IsNull()) {
-      START_TIMER(isolate, time_native_execution);
       if (FLAG_check_function_fingerprints) {
         Library::CheckFunctionFingerprints();
       }
+      START_TIMER(time_total_runtime);
       return reinterpret_cast<Dart_Isolate>(isolate);
     }
     *error = strdup(error_obj.ToErrorCString());
   }
-  STOP_TIMER(isolate, time_native_execution);
-  STOP_TIMER(isolate, time_total_runtime);
   Dart::ShutdownIsolate();
   return reinterpret_cast<Dart_Isolate>(NULL);
 }
 
 
 DART_EXPORT void Dart_ShutdownIsolate() {
   Isolate* isolate = Isolate::Current();
   CHECK_ISOLATE(isolate);
   {
     StackZone zone(isolate);
     HandleScope handle_scope(isolate);
     Dart::RunShutdownCallback();
   }
-  STOP_TIMER(isolate, time_native_execution);
-  STOP_TIMER(isolate, time_total_runtime);
+  STOP_TIMER(time_total_runtime);
   Dart::ShutdownIsolate();
 }
 
 
 DART_EXPORT Dart_Isolate Dart_CurrentIsolate() {
   return Api::CastIsolate(Isolate::Current());
 }
 
 
 DART_EXPORT void* Dart_CurrentIsolateData() {
@@ skipping 41 matching lines @@
                               intptr_t new_size) {
   return Api::TopScope(Isolate::Current())->zone()->Realloc<uint8_t>(
       ptr, old_size, new_size);
 }
 
 
 DART_EXPORT Dart_Handle Dart_CreateSnapshot(uint8_t** buffer,
                                             intptr_t* size) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
-  TIMERSCOPE(isolate, time_creating_snapshot);
+  TIMERSCOPE(time_creating_snapshot);
   if (buffer == NULL) {
     RETURN_NULL_ERROR(buffer);
   }
   if (size == NULL) {
     RETURN_NULL_ERROR(size);
   }
   Dart_Handle state = Api::CheckIsolateState(isolate);
   if (::Dart_IsError(state)) {
     return state;
   }
   // Since this is only a snapshot the root library should not be set.
   isolate->object_store()->set_root_library(Library::Handle(isolate));
   FullSnapshotWriter writer(buffer, ApiReallocate);
   writer.WriteFullSnapshot();
   *size = writer.BytesWritten();
   return Api::Success();
 }
 
 
 DART_EXPORT Dart_Handle Dart_CreateScriptSnapshot(uint8_t** buffer,
                                                   intptr_t* size) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
-  TIMERSCOPE(isolate, time_creating_snapshot);
+  TIMERSCOPE(time_creating_snapshot);
   if (buffer == NULL) {
     RETURN_NULL_ERROR(buffer);
   }
   if (size == NULL) {
     RETURN_NULL_ERROR(size);
   }
   Dart_Handle state = Api::CheckIsolateState(isolate);
   if (::Dart_IsError(state)) {
     return state;
   }
@@ skipping 209 matching lines @@
     return Api::Success();
   }
   return Api::NewError("Dart_PostMessage failed.");
 }
 
 // --- Scopes ----
 
 DART_EXPORT void Dart_EnterScope() {
   Isolate* isolate = Isolate::Current();
   CHECK_ISOLATE(isolate);
-  NativeToVmTimerScope __temp_isolate_timer__(isolate);
   ApiState* state = isolate->api_state();
   ASSERT(state != NULL);
   ApiLocalScope* new_scope = state->reusable_scope();
   if (new_scope == NULL) {
     new_scope = new ApiLocalScope(state->top_scope(),
                                   isolate->top_exit_frame_info());
     ASSERT(new_scope != NULL);
   } else {
     new_scope->Reinit(isolate,
                       state->top_scope(),
@@ skipping 1975 matching lines @@
 }
 
 
 DART_EXPORT Dart_Handle Dart_Invoke(Dart_Handle target,
                                     Dart_Handle name,
                                     int number_of_arguments,
                                     Dart_Handle* arguments) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   CHECK_CALLBACK_STATE(isolate);
+  // TODO(turnidge): This is a bit simplistic.  It overcounts when
+  // other operations (gc, compilation) are active.
+  TIMERSCOPE(time_dart_execution);
 
   const String& function_name = Api::UnwrapStringHandle(isolate, name);
   if (function_name.IsNull()) {
     RETURN_TYPE_ERROR(isolate, name, String);
   }
   if (number_of_arguments < 0) {
     return Api::NewError(
         "%s expects argument 'number_of_arguments' to be non-negative.",
         CURRENT_FUNC);
   }
@@ skipping 883 matching lines @@
       lib.SetLoadError();
     }
   }
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadScript(Dart_Handle url,
                                         Dart_Handle source,
                                         intptr_t line_offset,
                                         intptr_t col_offset) {
+  TIMERSCOPE(time_script_loading);
   Isolate* isolate = Isolate::Current();
-  TIMERSCOPE(isolate, time_script_loading);
   DARTSCOPE(isolate);
   const String& url_str = Api::UnwrapStringHandle(isolate, url);
   if (url_str.IsNull()) {
     RETURN_TYPE_ERROR(isolate, url, String);
   }
   const String& source_str = Api::UnwrapStringHandle(isolate, source);
   if (source_str.IsNull()) {
     RETURN_TYPE_ERROR(isolate, source, String);
   }
   Library& library =
@@ skipping 26 matching lines @@
   Dart_Handle result;
   CompileSource(isolate, library, script, &result);
   return result;
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadScriptFromSnapshot(const uint8_t* buffer,
                                                     intptr_t buffer_len) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
-  TIMERSCOPE(isolate, time_script_loading);
+  TIMERSCOPE(time_script_loading);
   if (buffer == NULL) {
     RETURN_NULL_ERROR(buffer);
   }
   NoHeapGrowthControlScope no_growth_control;
 
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
   if (!snapshot->IsScriptSnapshot()) {
     return Api::NewError("%s expects parameter 'buffer' to be a script type"
                          " snapshot.", CURRENT_FUNC);
   }
@@ skipping 161 matching lines @@
     return Api::NewError("%s: library '%s' not found.",
                          CURRENT_FUNC, url_str.ToCString());
   } else {
     return Api::NewHandle(isolate, library.raw());
   }
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadLibrary(Dart_Handle url,
                                          Dart_Handle source) {
+  TIMERSCOPE(time_script_loading);
   Isolate* isolate = Isolate::Current();
-  TIMERSCOPE(isolate, time_script_loading);
   DARTSCOPE(isolate);
   const String& url_str = Api::UnwrapStringHandle(isolate, url);
   if (url_str.IsNull()) {
     RETURN_TYPE_ERROR(isolate, url, String);
   }
   const String& source_str = Api::UnwrapStringHandle(isolate, source);
   if (source_str.IsNull()) {
     RETURN_TYPE_ERROR(isolate, source, String);
   }
   CHECK_CALLBACK_STATE(isolate);
@@ skipping 70 matching lines @@
       library_vm.AddObject(library_prefix, prefix_symbol);
     }
   }
   return Api::Success();
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadSource(Dart_Handle library,
                                         Dart_Handle url,
                                         Dart_Handle source) {
+  TIMERSCOPE(time_script_loading);
   Isolate* isolate = Isolate::Current();
-  TIMERSCOPE(isolate, time_script_loading);
   DARTSCOPE(isolate);
   const Library& lib = Api::UnwrapLibraryHandle(isolate, library);
   if (lib.IsNull()) {
     RETURN_TYPE_ERROR(isolate, library, Library);
   }
   const String& url_str = Api::UnwrapStringHandle(isolate, url);
   if (url_str.IsNull()) {
     RETURN_TYPE_ERROR(isolate, url, String);
   }
   const String& source_str = Api::UnwrapStringHandle(isolate, source);
   if (source_str.IsNull()) {
     RETURN_TYPE_ERROR(isolate, source, String);
   }
   CHECK_CALLBACK_STATE(isolate);
 
   NoHeapGrowthControlScope no_growth_control;
 
   const Script& script = Script::Handle(
       isolate, Script::New(url_str, source_str, RawScript::kSourceTag));
   Dart_Handle result;
   CompileSource(isolate, lib, script, &result);
   return result;
 }
 
 
 DART_EXPORT Dart_Handle Dart_LibraryLoadPatch(Dart_Handle library,
                                               Dart_Handle url,
                                               Dart_Handle patch_source) {
+  TIMERSCOPE(time_script_loading);
   Isolate* isolate = Isolate::Current();
-  TIMERSCOPE(isolate, time_script_loading);
   DARTSCOPE(isolate);
   const Library& lib = Api::UnwrapLibraryHandle(isolate, library);
   if (lib.IsNull()) {
     RETURN_TYPE_ERROR(isolate, library, Library);
   }
   const String& url_str = Api::UnwrapStringHandle(isolate, url);
   if (url_str.IsNull()) {
     RETURN_TYPE_ERROR(isolate, url, String);
   }
   const String& source_str = Api::UnwrapStringHandle(isolate, patch_source);
@@ skipping 88 matching lines @@
 
 
 DART_EXPORT void Dart_RegisterRootServiceRequestCallback(
     const char* name,
     Dart_ServiceRequestCallback callback,
     void* user_data) {
   Service::RegisterRootEmbedderCallback(name, callback, user_data);
 }
 
 }  // namespace dart