[counter] Properly measure own-time of runtime counters.

src/arguments.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_ARGUMENTS_H_
 #define V8_ARGUMENTS_H_
 
 #include "src/allocation.h"
 #include "src/isolate.h"
 
@@ skipping 253 matching lines @@
 
 double ClobberDoubleRegisters(double x1, double x2, double x3, double x4);
 
 
 #ifdef DEBUG
 #define CLOBBER_DOUBLE_REGISTERS() ClobberDoubleRegisters(1, 2, 3, 4);
 #else
 #define CLOBBER_DOUBLE_REGISTERS()
 #endif
 
-#define RUNTIME_FUNCTION_RETURNS_TYPE(Type, Name)                         \
-  static INLINE(Type __RT_impl_##Name(Arguments args, Isolate* isolate)); \
-  Type Name(int args_length, Object** args_object, Isolate* isolate) {    \
-    CLOBBER_DOUBLE_REGISTERS();                                           \
-    RuntimeCallStats* stats = isolate->counters()->runtime_call_stats();  \
-    stats->Count_##Name++;                                                \
-    base::ElapsedTimer timer;                                             \
-    bool timing = false;                                                  \
-    if (FLAG_runtime_call_stats && !stats->in_runtime_call) {             \
-      stats->in_runtime_call = true;                                      \
-      timing = true;                                                      \
-      timer.Start();                                                      \
-    }                                                                     \
-    Arguments args(args_length, args_object);                             \
-    Type value = __RT_impl_##Name(args, isolate);                         \
-    if (timing) {                                                         \
-      stats->in_runtime_call = false;                                     \
-      isolate->counters()->runtime_call_stats()->Time_##Name +=           \
-          timer.Elapsed();                                                \
-    }                                                                     \
-    return value;                                                         \
-  }                                                                       \
+#define RUNTIME_FUNCTION_RETURNS_TYPE(Type, Name)                          \
+  static INLINE(Type __RT_impl_##Name(Arguments args, Isolate* isolate));  \
+  Type Name(int args_length, Object** args_object, Isolate* isolate) {     \
+    CLOBBER_DOUBLE_REGISTERS();                                            \
+    base::ElapsedTimer timer;                                              \
+    if (FLAG_runtime_call_stats) {                                         \
+      RuntimeCallStats* stats = isolate->counters()->runtime_call_stats(); \
+      stats->Enter(&stats->Name);                                          \
+      timer.Start();                                                       \
+    }                                                                      \
+    Arguments args(args_length, args_object);                              \
+    Type value = __RT_impl_##Name(args, isolate);                          \
+    if (FLAG_runtime_call_stats) {                                         \
+      isolate->counters()->runtime_call_stats()->Leave(timer.Elapsed());   \
+    }                                                                      \
+    return value;                                                          \
+  }                                                                        \
   static Type __RT_impl_##Name(Arguments args, Isolate* isolate)
 
 #define RUNTIME_FUNCTION(Name) RUNTIME_FUNCTION_RETURNS_TYPE(Object*, Name)
 #define RUNTIME_FUNCTION_RETURN_PAIR(Name) \
     RUNTIME_FUNCTION_RETURNS_TYPE(ObjectPair, Name)
 #define RUNTIME_FUNCTION_RETURN_TRIPLE(Name) \
     RUNTIME_FUNCTION_RETURNS_TYPE(ObjectTriple, Name)
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_ARGUMENTS_H_