Do not count invocations but usage of a function, i.e., increment a function's counter at IC calls …

runtime/vm/isolate.cc

 // Copyright (c) 2012, 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/isolate.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/bigint_store.h"
 #include "vm/code_index_table.h"
 #include "vm/compiler_stats.h"
 #include "vm/dart_api_state.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/debuginfo.h"
 #include "vm/heap.h"
 #include "vm/message.h"
 #include "vm/object_store.h"
 #include "vm/parser.h"
 #include "vm/port.h"
 #include "vm/random.h"
 #include "vm/stack_frame.h"
 #include "vm/stub_code.h"
 #include "vm/thread.h"
 #include "vm/timer.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
-DEFINE_FLAG(bool, report_invocation_count, false,
-            "Count function invocations and report.");
+DEFINE_FLAG(bool, report_usage_count, false,
+            "Track function usage and report.");
 DEFINE_FLAG(bool, trace_isolates, false,
             "Trace isolate creation and shut down.");
 DECLARE_FLAG(bool, generate_gdb_symbols);
 
 
 class IsolateMessageHandler : public MessageHandler {
  public:
   explicit IsolateMessageHandler(Isolate* isolate);
   ~IsolateMessageHandler();
 
@@ skipping 203 matching lines @@
   MutexLocker ml(mutex_);
   if (stack_limit_ == saved_stack_limit_) {
     return 0;  // No interrupt was requested.
   }
   uword interrupt_bits = stack_limit_ & kInterruptsMask;
   stack_limit_ = saved_stack_limit_;
   return interrupt_bits;
 }
 
 
-static int MostCalledFunctionFirst(const Function* const* a,
-                                   const Function* const* b) {
-  if ((*a)->invocation_counter() > (*b)->invocation_counter()) {
+static int MostUsedFunctionFirst(const Function* const* a,
+                                 const Function* const* b) {
+  if ((*a)->usage_counter() > (*b)->usage_counter()) {
     return -1;
-  } else if ((*a)->invocation_counter() < (*b)->invocation_counter()) {
+  } else if ((*a)->usage_counter() < (*b)->usage_counter()) {
     return 1;
   } else {
     return 0;
   }
 }
 
 
 static void AddFunctionsFromClass(const Class& cls,
                                   GrowableArray<const Function*>* functions) {
   const Array& class_functions = Array::Handle(cls.functions());
   // Class 'Dynamic' is allocated/initialized in a special way, leaving
   // the functions field NULL instead of empty.
   const int func_len = class_functions.IsNull() ? 0 : class_functions.Length();
   for (int j = 0; j < func_len; j++) {
     Function& function = Function::Handle();
     function ^= class_functions.At(j);
-    if (function.invocation_counter() > 0) {
+    if (function.usage_counter() > 0) {
       functions->Add(&function);
     }
   }
 }
 
 
 void Isolate::PrintInvokedFunctions() {
   ASSERT(this == Isolate::Current());
   Zone zone(this);
   HandleScope handle_scope(this);
   Library& library = Library::Handle();
   library = object_store()->registered_libraries();
   GrowableArray<const Function*> invoked_functions;
   while (!library.IsNull()) {
     Class& cls = Class::Handle();
     ClassDictionaryIterator iter(library);
     while (iter.HasNext()) {
       cls = iter.GetNextClass();
       AddFunctionsFromClass(cls, &invoked_functions);
     }
     Array& anon_classes = Array::Handle(library.raw_ptr()->anonymous_classes_);
     for (int i = 0; i < library.raw_ptr()->num_anonymous_; i++) {
       cls ^= anon_classes.At(i);
       AddFunctionsFromClass(cls, &invoked_functions);
     }
     library = library.next_registered();
   }
-  invoked_functions.Sort(MostCalledFunctionFirst);
+  invoked_functions.Sort(MostUsedFunctionFirst);
   for (int i = 0; i < invoked_functions.length(); i++) {
     OS::Print("%10d x %s\n",
-        invoked_functions[i]->invocation_counter(),
+        invoked_functions[i]->usage_counter(),
         invoked_functions[i]->ToFullyQualifiedCString());
   }
 }
 
 
 void Isolate::Shutdown() {
   ASSERT(this == Isolate::Current());
   ASSERT(top_resource_ == NULL);
   ASSERT((heap_ == NULL) || heap_->Verify());
 
   // Clean up debugger resources. Shutting down the debugger
   // requires a handle zone. We must set up a temporary zone because
   // Isolate::Shutdown is called without a zone.
   {
     Zone zone(this);
     HandleScope handle_scope(this);
     debugger_->Shutdown();
   }
 
   // Close all the ports owned by this isolate.
   PortMap::ClosePorts(message_handler());
 
   // Fail fast if anybody tries to post any more messsages to this isolate.
   delete message_handler();
   set_message_handler(NULL);
 
   // Dump all accumalated timer data for the isolate.
   timer_list_.ReportTimers();
-  if (FLAG_report_invocation_count) {
+  if (FLAG_report_usage_count) {
     PrintInvokedFunctions();
   }
   CompilerStats::Print();
   if (FLAG_generate_gdb_symbols) {
     DebugInfo::UnregisterAllSections();
   }
   if (FLAG_trace_isolates) {
     OS::Print("[-] Stopping isolate:\n"
               "\tisolate:    %s\n", name());
   }
@@ skipping 117 matching lines @@
 }
 
 
 void Isolate::VisitWeakPersistentHandles(HandleVisitor* visitor) {
   if (api_state() != NULL) {
     api_state()->VisitWeakHandles(visitor);
   }
 }
 
 }  // namespace dart