Factor out a Histogram class from HistogramTimer, and use it to measure external fragmentation

src/v8-counters.h

 // Copyright 2011 the V8 project authors. All rights reserved.

[Michael Starzinger, 2012/07/02 21:09:56]

2012

[jochen (gone - plz use gerrit), 2012/07/13 09:48:08]

Done.

 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
 //       with the distribution.
@@ skipping 31 matching lines @@
   /* Parsing timers. */                                               \
   HT(parse, V8.Parse)                                                 \
   HT(parse_lazy, V8.ParseLazy)                                        \
   HT(pre_parse, V8.PreParse)                                          \
   /* Total compilation times. */                                      \
   HT(compile, V8.Compile)                                             \
   HT(compile_eval, V8.CompileEval)                                    \
   HT(compile_lazy, V8.CompileLazy)
 
 
+#define HISTOGRAM_MEMORY_LIST(HM)                                     \
+  HM(new_space_bytes_available, V8.MemoryNewSpaceBytesAvailable)      \
+  HM(new_space_bytes_committed, V8.MemoryNewSpaceBytesCommitted)      \
+  HM(new_space_bytes_used, V8.MemoryNewSpaceBytesUsed)                \
+  HM(old_pointer_space_bytes_available,                               \
+     V8.MemoryOldPointerSpaceBytesAvailable)                          \
+  HM(old_pointer_space_bytes_committed,                               \
+     V8.MemoryOldPointerSpaceBytesCommitted)                          \
+  HM(old_pointer_space_bytes_used, V8.MemoryOldPointerSpaceBytesUsed) \
+  HM(old_data_space_bytes_available, V8.MemoryOldDataSpaceBytesAvailable) \
+  HM(old_data_space_bytes_committed, V8.MemoryOldDataSpaceBytesCommitted) \
+  HM(old_data_space_bytes_used, V8.MemoryOldDataSpaceBytesUsed)       \
+  HM(code_space_bytes_available, V8.MemoryCodeSpaceBytesAvailable)    \
+  HM(code_space_bytes_committed, V8.MemoryCodeSpaceBytesCommitted)    \
+  HM(code_space_bytes_used, V8.MemoryCodeSpaceBytesUsed)              \
+  HM(map_space_bytes_available, V8.MemoryMapSpaceBytesAvailable)      \
+  HM(map_space_bytes_committed, V8.MemoryMapSpaceBytesCommitted)      \
+  HM(map_space_bytes_used, V8.MemoryMapSpaceBytesUsed)                \
+  HM(cell_space_bytes_available, V8.MemoryCellSpaceBytesAvailable)    \
+  HM(cell_space_bytes_committed, V8.MemoryCellSpaceBytesCommitted)    \
+  HM(cell_space_bytes_used, V8.MemoryCellSpaceBytesUsed)              \
+  HM(lo_space_bytes_available, V8.MemoryLoSpaceBytesAvailable)        \
+  HM(lo_space_bytes_committed, V8.MemoryLoSpaceBytesCommitted)        \
+  HM(lo_space_bytes_used, V8.MemoryLoSpaceBytesUsed)
+
+
 // WARNING: STATS_COUNTER_LIST_* is a very large macro that is causing MSVC
 // Intellisense to crash.  It was broken into two macros (each of length 40
 // lines) rather than one macro (of length about 80 lines) to work around
 // this problem.  Please avoid using recursive macros of this length when
 // possible.
 #define STATS_COUNTER_LIST_1(SC)                                      \
   /* Global Handle Count*/                                            \
   SC(global_handles, V8.GlobalHandles)                                \
   /* Mallocs from PCRE */                                             \
   SC(pcre_mallocs, V8.PcreMallocCount)                                \
@@ skipping 176 matching lines @@
   SC(math_sin, V8.MathSin)                                            \
   SC(math_sqrt, V8.MathSqrt)                                          \
   SC(math_tan, V8.MathTan)                                            \
   SC(transcendental_cache_hit, V8.TranscendentalCacheHit)             \
   SC(transcendental_cache_miss, V8.TranscendentalCacheMiss)           \
   SC(stack_interrupts, V8.StackInterrupts)                            \
   SC(runtime_profiler_ticks, V8.RuntimeProfilerTicks)                 \
   SC(smi_checks_removed, V8.SmiChecksRemoved)                         \
   SC(map_checks_removed, V8.MapChecksRemoved)                         \
   SC(quote_json_char_count, V8.QuoteJsonCharacterCount)               \
-  SC(quote_json_char_recount, V8.QuoteJsonCharacterReCount)           \
-  SC(new_space_bytes_available, V8.MemoryNewSpaceBytesAvailable)      \
-  SC(new_space_bytes_committed, V8.MemoryNewSpaceBytesCommitted)      \
-  SC(new_space_bytes_used, V8.MemoryNewSpaceBytesUsed)                \
-  SC(old_pointer_space_bytes_available,                               \
-     V8.MemoryOldPointerSpaceBytesAvailable)                          \
-  SC(old_pointer_space_bytes_committed,                               \
-     V8.MemoryOldPointerSpaceBytesCommitted)                          \
-  SC(old_pointer_space_bytes_used, V8.MemoryOldPointerSpaceBytesUsed) \
-  SC(old_data_space_bytes_available, V8.MemoryOldDataSpaceBytesAvailable) \
-  SC(old_data_space_bytes_committed, V8.MemoryOldDataSpaceBytesCommitted) \
-  SC(old_data_space_bytes_used, V8.MemoryOldDataSpaceBytesUsed)       \
-  SC(code_space_bytes_available, V8.MemoryCodeSpaceBytesAvailable)    \
-  SC(code_space_bytes_committed, V8.MemoryCodeSpaceBytesCommitted)    \
-  SC(code_space_bytes_used, V8.MemoryCodeSpaceBytesUsed)              \
-  SC(map_space_bytes_available, V8.MemoryMapSpaceBytesAvailable)      \
-  SC(map_space_bytes_committed, V8.MemoryMapSpaceBytesCommitted)      \
-  SC(map_space_bytes_used, V8.MemoryMapSpaceBytesUsed)                \
-  SC(cell_space_bytes_available, V8.MemoryCellSpaceBytesAvailable)    \
-  SC(cell_space_bytes_committed, V8.MemoryCellSpaceBytesCommitted)    \
-  SC(cell_space_bytes_used, V8.MemoryCellSpaceBytesUsed)              \
-  SC(lo_space_bytes_available, V8.MemoryLoSpaceBytesAvailable)        \
-  SC(lo_space_bytes_committed, V8.MemoryLoSpaceBytesCommitted)        \
-  SC(lo_space_bytes_used, V8.MemoryLoSpaceBytesUsed)
+  SC(quote_json_char_recount, V8.QuoteJsonCharacterReCount)
 
 
 // This file contains all the v8 counters that are in use.
 class Counters {
  public:
 #define HT(name, caption) \
   HistogramTimer* name() { return &name##_; }
   HISTOGRAM_TIMER_LIST(HT)
 #undef HT
 
+#define HM(name, caption) \
+  Histogram* name() { return &name##_; }
+  HISTOGRAM_MEMORY_LIST(HM)
+#undef HM
+
 #define SC(name, caption) \
   StatsCounter* name() { return &name##_; }
   STATS_COUNTER_LIST_1(SC)
   STATS_COUNTER_LIST_2(SC)
 #undef SC
 
   enum Id {
 #define RATE_ID(name, caption) k_##name,
     HISTOGRAM_TIMER_LIST(RATE_ID)
 #undef RATE_ID
+#define MEMORY_ID(name, caption) k_##name,
+    HISTOGRAM_MEMORY_LIST(MEMORY_ID)
+#undef MEMORY_ID
 #define COUNTER_ID(name, caption) k_##name,
     STATS_COUNTER_LIST_1(COUNTER_ID)
     STATS_COUNTER_LIST_2(COUNTER_ID)
 #undef COUNTER_ID
 #define COUNTER_ID(name) k_##name,
     STATE_TAG_LIST(COUNTER_ID)
 #undef COUNTER_ID
     stats_counter_count
   };
 
   StatsCounter* state_counters(StateTag state) {
     return &state_counters_[state];
   }
 
  private:
 #define HT(name, caption) \
   HistogramTimer name##_;
   HISTOGRAM_TIMER_LIST(HT)
 #undef HT
 
+#define HM(name, caption) \
+  Histogram name##_;
+  HISTOGRAM_MEMORY_LIST(HM)
+#undef HM
+
 #define SC(name, caption) \
   StatsCounter name##_;
   STATS_COUNTER_LIST_1(SC)
   STATS_COUNTER_LIST_2(SC)
 #undef SC
 
   enum {
 #define COUNTER_ID(name) __##name,
     STATE_TAG_LIST(COUNTER_ID)
 #undef COUNTER_ID
     kSlidingStateWindowCounterCount
   };
 
   // Sliding state window counters.
   StatsCounter state_counters_[kSlidingStateWindowCounterCount];
   friend class Isolate;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(Counters);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_V8_COUNTERS_H_