Tracked objects: Bump cumulative byte count storage to 64 bits to avoid saturation

base/tracked_objects_unittest.cc

Index: base/tracked_objects_unittest.cc
diff --git a/base/tracked_objects_unittest.cc b/base/tracked_objects_unittest.cc
index f208e3c9818fca3f5d1d54ea298471c883c64091..4bbc28cf37d12357dd12339df46616a3f78035f7 100644
--- a/base/tracked_objects_unittest.cc
+++ b/base/tracked_objects_unittest.cc
@@ -346,13 +346,18 @@ TEST_F(TrackedObjectsTest, DeathDataTestRecordAllocations) {
   EXPECT_EQ(data->alloc_overhead_bytes(), 3 * kAllocOverheadBytes);
   EXPECT_EQ(data->max_allocated_bytes(), kLargerMaxAllocatedBytes);
 
-  // Saturate everything.
+  // Saturate the counts.
   data->RecordAllocations(INT_MAX, INT_MAX, INT_MAX, INT_MAX, INT_MAX, INT_MAX);

[gab, 2017/05/02 21:17:12]

INT_MAX no longer saturates though right?

[Sigurður Ásgeirsson, 2017/05/03 14:10:10]

Comment amended to moar specific specificity.

   EXPECT_EQ(data->alloc_ops(), INT_MAX);
   EXPECT_EQ(data->free_ops(), INT_MAX);
-  EXPECT_EQ(data->allocated_bytes(), INT_MAX);
-  EXPECT_EQ(data->freed_bytes(), INT_MAX);
-  EXPECT_EQ(data->alloc_overhead_bytes(), INT_MAX);
+  // The cumulative byte counts are 64 bit wide, and won't saturate easily.
+  EXPECT_EQ(data->allocated_bytes(),
+            static_cast<int64_t>(INT_MAX) +
+                static_cast<int64_t>(3 * kAllocatedBytes));
+  EXPECT_EQ(data->freed_bytes(),
+            static_cast<int64_t>(INT_MAX) + 3 * kFreedBytes);
+  EXPECT_EQ(data->alloc_overhead_bytes(),
+            static_cast<int64_t>(INT_MAX) + 3 * kAllocOverheadBytes);
   EXPECT_EQ(data->max_allocated_bytes(), INT_MAX);
 }

[gab, 2017/05/02 21:17:12]

Do we have any tests that verify the new range beyond 32-bit integers?

[Sigurður Ásgeirsson, 2017/05/03 14:10:10]

The test above now goes to 2^32 + some.