Bug 1120798 - Use a larger realloc in one of the DMD tests so that it passes for mozjemalloc as well as jemalloc3. r=njn
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 13 Jan 2015 14:36:29 +0900
changeset 223715 ce75473a8e87fafb3243071629f864c0e0e90e3c
parent 223714 4c63c749f2ca48fe59d503efd96a2e8277133c1f
child 223716 dbd00d4ec628c260a146157235ec3bd7b3c9dfec
push id53994
push usermh@glandium.org
push dateWed, 14 Jan 2015 06:23:03 +0000
treeherdermozilla-inbound@338a9ad8a020 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnjn
bugs1120798
milestone38.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 1120798 - Use a larger realloc in one of the DMD tests so that it passes for mozjemalloc as well as jemalloc3. r=njn
memory/replace/dmd/test/SmokeDMD.cpp
memory/replace/dmd/test/full-unsampled1-dark-matter-expected.txt
memory/replace/dmd/test/full-unsampled1-live-expected.txt
memory/replace/dmd/test/full-unsampled2-cumulative-expected.txt
--- a/memory/replace/dmd/test/SmokeDMD.cpp
+++ b/memory/replace/dmd/test/SmokeDMD.cpp
@@ -159,17 +159,17 @@ TestUnsampled(const char* aTestName, int
   // Analyze 1: ignored.
   // Analyze 2: irrelevant.
   Report((void*)(intptr_t)i);
 
   // jemalloc rounds this up to 8192.
   // Analyze 1: reported.
   // Analyze 2: freed.
   char* e = (char*) malloc(4096);
-  e = (char*) realloc(e, 4097);
+  e = (char*) realloc(e, 7169);
   Report(e);
 
   // First realloc is like malloc;  second realloc is shrinking.
   // Analyze 1: reported.
   // Analyze 2: re-reported.
   char* e2 = (char*) realloc(nullptr, 1024);
   e2 = (char*) realloc(e2, 512);
   Report(e2);
--- a/memory/replace/dmd/test/full-unsampled1-dark-matter-expected.txt
+++ b/memory/replace/dmd/test/full-unsampled1-dark-matter-expected.txt
@@ -107,17 +107,17 @@ Unreported {
     #01: ... DMD.cpp ...
   }
 }
 
 #-----------------------------------------------------------------
 
 Once-reported {
   1 block in heap block record 1 of 11
-  8,192 bytes (4,097 requested / 4,095 slop)
+  8,192 bytes (7,169 requested / 1,023 slop)
   67.77% of the heap (67.77% cumulative)
   77.40% of once-reported (77.40% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
   Reported at {
     #01: ... DMD.cpp ...
   }
--- a/memory/replace/dmd/test/full-unsampled1-live-expected.txt
+++ b/memory/replace/dmd/test/full-unsampled1-live-expected.txt
@@ -6,17 +6,17 @@ Invocation {
   Mode = 'live'
   Sample-below size = 1
 }
 
 #-----------------------------------------------------------------
 
 Live {
   1 block in heap block record 1 of 12
-  8,192 bytes (4,097 requested / 4,095 slop)
+  8,192 bytes (7,169 requested / 1,023 slop)
   67.77% of the heap (67.77% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 Live {
   1 block in heap block record 2 of 12
--- a/memory/replace/dmd/test/full-unsampled2-cumulative-expected.txt
+++ b/memory/replace/dmd/test/full-unsampled2-cumulative-expected.txt
@@ -6,17 +6,17 @@ Invocation {
   Mode = 'cumulative'
   Sample-below size = 1
 }
 
 #-----------------------------------------------------------------
 
 Cumulative {
   1 block in heap block record 1 of 16
-  8,192 bytes (4,097 requested / 4,095 slop)
+  8,192 bytes (7,169 requested / 1,023 slop)
   47.10% of the heap (47.10% cumulative)
   Allocated at {
     #01: ... DMD.cpp ...
   }
 }
 
 Cumulative {
   1 block in heap block record 2 of 16