Add histograms for total allocated/live heap size, as well as allocated size and percentage of tota…

src/v8-counters.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // 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
@@ skipping 47 matching lines @@
      V8.MemoryExternalFragmentationOldPointerSpace)                   \
   HP(external_fragmentation_old_data_space,                           \
      V8.MemoryExternalFragmentationOldDataSpace)                      \
   HP(external_fragmentation_code_space,                               \
      V8.MemoryExternalFragmentationCodeSpace)                         \
   HP(external_fragmentation_map_space,                                \
      V8.MemoryExternalFragmentationMapSpace)                          \
   HP(external_fragmentation_cell_space,                               \
      V8.MemoryExternalFragmentationCellSpace)                         \
   HP(external_fragmentation_lo_space,                                 \
-     V8.MemoryExternalFragmentationLoSpace)
+     V8.MemoryExternalFragmentationLoSpace)                           \
+  HP(map_space_fraction_of_total,                                     \
+     V8.MemoryFractionMapSpace)                                       \
+  HP(cell_space_fraction_of_total,                                    \
+     V8.MemoryFractionCellSpace)                                      \
+
+
+#define HISTOGRAM_MEMORY_LIST(HM)                                     \
+  HM(total_heap_size, V8.MemoryHeapSizeTotal)                         \
+  HM(live_heap_size, V8.MemoryHeapSizeLive)                           \
+  HM(total_map_space_size, V8.MemoryMapSpaceSize)                     \
+  HM(total_cell_space_size, V8.MemoryCellSpaceSize)

[Michael Starzinger, 2012/08/08 18:44:36]

We should start using consistent names for the heap-related counters and
histograms, otherwise this will get out of hand. Especially when it comes to
"live" vs. "used" and "total" vs. "committed". How about the following names for
the new histograms? WDYT?

- heap_fraction_map_space
- heap_fraction_cell_space
- heap_sample_[total_]committed  (the "total_" could be omitted)
- heap_sample_[total_]used       (likewise)
- heap_sample_map_space_committed
- heap_sample_cell_space_committed

I have no strong opinion about the externally visible names, so we can leave
them as they are.

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

Done.

 
 
 // 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)                                \
@@ skipping 217 matching lines @@
 #define HT(name, caption) \
   HistogramTimer* name() { return &name##_; }
   HISTOGRAM_TIMER_LIST(HT)
 #undef HT
 
 #define HP(name, caption) \
   Histogram* name() { return &name##_; }
   HISTOGRAM_PERCENTAGE_LIST(HP)
 #undef HP
 
+#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
 
 #define SC(name) \
   StatsCounter* count_of_##name() { return &count_of_##name##_; } \
   StatsCounter* size_of_##name() { return &size_of_##name##_; }
   INSTANCE_TYPE_LIST(SC)
@@ skipping 15 matching lines @@
   FIXED_ARRAY_SUB_INSTANCE_TYPE_LIST(SC)
 #undef SC
 
   enum Id {
 #define RATE_ID(name, caption) k_##name,
     HISTOGRAM_TIMER_LIST(RATE_ID)
 #undef RATE_ID
 #define PERCENTAGE_ID(name, caption) k_##name,
     HISTOGRAM_PERCENTAGE_LIST(PERCENTAGE_ID)
 #undef PERCENTAGE_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) kCountOf##name, kSizeOf##name,
     INSTANCE_TYPE_LIST(COUNTER_ID)
 #undef COUNTER_ID
 #define COUNTER_ID(name) kCountOfCODE_TYPE_##name, \
     kSizeOfCODE_TYPE_##name,
     CODE_KIND_LIST(COUNTER_ID)
@@ skipping 18 matching lines @@
 #define HT(name, caption) \
   HistogramTimer name##_;
   HISTOGRAM_TIMER_LIST(HT)
 #undef HT
 
 #define HP(name, caption) \
   Histogram name##_;
   HISTOGRAM_PERCENTAGE_LIST(HP)
 #undef HP
 
+#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
 
 #define SC(name) \
   StatsCounter size_of_##name##_; \
   StatsCounter count_of_##name##_;
   INSTANCE_TYPE_LIST(SC)
@@ skipping 21 matching lines @@
   // Sliding state window counters.
   StatsCounter state_counters_[kSlidingStateWindowCounterCount];
   friend class Isolate;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(Counters);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_V8_COUNTERS_H_