Bug 1090591 - Fix test_dmd.js on jemalloc3 builds. r=njn
authorGuilherme Goncalves <guilherme.p.gonc@gmail.com>
Tue, 28 Oct 2014 16:13:00 -0400
changeset 213129 6d7fb88f8d581683609dd111e319bc3a4d8e2eb3
parent 213128 b8a2ba76b8fe813eb4431fec147a85a4d4899572
child 213130 fa5e5aa43a3011acb3913be514f9a6094c622236
push id51151
push userryanvm@gmail.com
push dateThu, 30 Oct 2014 15:22:08 +0000
treeherdermozilla-inbound@c04dc26e8c0a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnjn
bugs1090591
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1090591 - Fix test_dmd.js on jemalloc3 builds. r=njn
memory/replace/dmd/test/SmokeDMD.cpp
memory/replace/dmd/test/full-heap-sampled-expected.txt
memory/replace/dmd/test/full-reports-sampled-expected.txt
--- a/memory/replace/dmd/test/SmokeDMD.cpp
+++ b/memory/replace/dmd/test/SmokeDMD.cpp
@@ -277,17 +277,17 @@ RunTests()
   char* s;
 
   // This equals the sample size, and so is reported exactly.  It should be
   // listed before records of the same size that are sampled.
   s = (char*) malloc(128);
   UseItOrLoseIt(s, seven);
 
   // This exceeds the sample size, and so is reported exactly.
-  s = (char*) malloc(144);
+  s = (char*) malloc(160);
   UseItOrLoseIt(s, seven);
 
   // These together constitute exactly one sample.
   for (int i = 0; i < seven + 9; i++) {
     s = (char*) malloc(8);
     UseItOrLoseIt(s, seven);
   }
 
--- a/memory/replace/dmd/test/full-heap-sampled-expected.txt
+++ b/memory/replace/dmd/test/full-heap-sampled-expected.txt
@@ -7,74 +7,74 @@ Invocation {
 }
 
 #-----------------------------------------------------------------
 
 Live {
   ~4 blocks in heap block record 1 of 7
   ~512 bytes (~512 requested / ~0 slop)
   Individual block sizes: ~128 x 3; 128
-  35.96% of the heap (35.96% cumulative)
+  35.56% of the heap (35.56% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 Live {
   1 block in heap block record 2 of 7
   256 bytes (256 requested / 0 slop)
-  17.98% of the heap (53.93% cumulative)
+  17.78% of the heap (53.33% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 Live {
   1 block in heap block record 3 of 7
-  144 bytes (144 requested / 0 slop)
-  10.11% of the heap (64.04% cumulative)
+  160 bytes (160 requested / 0 slop)
+  11.11% of the heap (64.44% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 Live {
   1 block in heap block record 4 of 7
   128 bytes (128 requested / 0 slop)
-  8.99% of the heap (73.03% cumulative)
+  8.89% of the heap (73.33% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 Live {
   ~1 block in heap block record 5 of 7
   ~128 bytes (~128 requested / ~0 slop)
-  8.99% of the heap (82.02% cumulative)
+  8.89% of the heap (82.22% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 Live {
   ~1 block in heap block record 6 of 7
   ~128 bytes (~128 requested / ~0 slop)
-  8.99% of the heap (91.01% cumulative)
+  8.89% of the heap (91.11% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 Live {
   ~1 block in heap block record 7 of 7
   ~128 bytes (~128 requested / ~0 slop)
-  8.99% of the heap (100.00% cumulative)
+  8.89% of the heap (100.00% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 #-----------------------------------------------------------------
 
 Summary {
-  Total: ~1,424 bytes in ~10 blocks
+  Total: ~1,440 bytes in ~10 blocks
 }
 
--- a/memory/replace/dmd/test/full-reports-sampled-expected.txt
+++ b/memory/replace/dmd/test/full-reports-sampled-expected.txt
@@ -11,88 +11,88 @@ Invocation {
 # no twice-reported heap blocks
 
 #-----------------------------------------------------------------
 
 Unreported {
   ~4 blocks in heap block record 1 of 7
   ~512 bytes (~512 requested / ~0 slop)
   Individual block sizes: ~128 x 3; 128
-  35.96% of the heap (35.96% cumulative)
-  35.96% of unreported (35.96% cumulative)
+  35.56% of the heap (35.56% cumulative)
+  35.56% of unreported (35.56% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 Unreported {
   1 block in heap block record 2 of 7
   256 bytes (256 requested / 0 slop)
-  17.98% of the heap (53.93% cumulative)
-  17.98% of unreported (53.93% cumulative)
+  17.78% of the heap (53.33% cumulative)
+  17.78% of unreported (53.33% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 Unreported {
   1 block in heap block record 3 of 7
-  144 bytes (144 requested / 0 slop)
-  10.11% of the heap (64.04% cumulative)
-  10.11% of unreported (64.04% cumulative)
+  160 bytes (160 requested / 0 slop)
+  11.11% of the heap (64.44% cumulative)
+  11.11% of unreported (64.44% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 Unreported {
   1 block in heap block record 4 of 7
   128 bytes (128 requested / 0 slop)
-  8.99% of the heap (73.03% cumulative)
-  8.99% of unreported (73.03% cumulative)
+  8.89% of the heap (73.33% cumulative)
+  8.89% of unreported (73.33% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 Unreported {
   ~1 block in heap block record 5 of 7
   ~128 bytes (~128 requested / ~0 slop)
-  8.99% of the heap (82.02% cumulative)
-  8.99% of unreported (82.02% cumulative)
+  8.89% of the heap (82.22% cumulative)
+  8.89% of unreported (82.22% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 Unreported {
   ~1 block in heap block record 6 of 7
   ~128 bytes (~128 requested / ~0 slop)
-  8.99% of the heap (91.01% cumulative)
-  8.99% of unreported (91.01% cumulative)
+  8.89% of the heap (91.11% cumulative)
+  8.89% of unreported (91.11% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 Unreported {
   ~1 block in heap block record 7 of 7
   ~128 bytes (~128 requested / ~0 slop)
-  8.99% of the heap (100.00% cumulative)
-  8.99% of unreported (100.00% cumulative)
+  8.89% of the heap (100.00% cumulative)
+  8.89% of unreported (100.00% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 #-----------------------------------------------------------------
 
 # no once-reported heap blocks
 
 #-----------------------------------------------------------------
 
 Summary {
-  Total:                ~1,424 bytes (100.00%) in     ~10 blocks (100.00%)
-  Unreported:           ~1,424 bytes (100.00%) in     ~10 blocks (100.00%)
+  Total:                ~1,440 bytes (100.00%) in     ~10 blocks (100.00%)
+  Unreported:           ~1,440 bytes (100.00%) in     ~10 blocks (100.00%)
   Once-reported:            ~0 bytes (  0.00%) in      ~0 blocks (  0.00%)
   Twice-reported:           ~0 bytes (  0.00%) in      ~0 blocks (  0.00%)
 }