From bac84fc9f103d982b896c665f411e0c5386a5eef Mon Sep 17 00:00:00 2001 From: Guilherme Goncalves Date: Tue, 28 Oct 2014 16:13:00 -0400 Subject: [PATCH] Bug 1090591 - Fix test_dmd.js on jemalloc3 builds. r=njn --- memory/replace/dmd/test/SmokeDMD.cpp | 2 +- .../dmd/test/full-heap-sampled-expected.txt | 18 +++++----- .../test/full-reports-sampled-expected.txt | 34 +++++++++---------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/memory/replace/dmd/test/SmokeDMD.cpp b/memory/replace/dmd/test/SmokeDMD.cpp index 74257187f355..48c51283c987 100644 --- a/memory/replace/dmd/test/SmokeDMD.cpp +++ b/memory/replace/dmd/test/SmokeDMD.cpp @@ -282,7 +282,7 @@ RunTests() 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. diff --git a/memory/replace/dmd/test/full-heap-sampled-expected.txt b/memory/replace/dmd/test/full-heap-sampled-expected.txt index 7ca5983817fb..68b781417d4a 100644 --- a/memory/replace/dmd/test/full-heap-sampled-expected.txt +++ b/memory/replace/dmd/test/full-heap-sampled-expected.txt @@ -12,7 +12,7 @@ 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 ... } @@ -21,7 +21,7 @@ Live { 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 ... } @@ -29,8 +29,8 @@ Live { 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 ... } @@ -39,7 +39,7 @@ Live { 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 ... } @@ -48,7 +48,7 @@ Live { 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 ... } @@ -57,7 +57,7 @@ Live { 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 ... } @@ -66,7 +66,7 @@ Live { 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 ... } @@ -75,6 +75,6 @@ Live { #----------------------------------------------------------------- Summary { - Total: ~1,424 bytes in ~10 blocks + Total: ~1,440 bytes in ~10 blocks } diff --git a/memory/replace/dmd/test/full-reports-sampled-expected.txt b/memory/replace/dmd/test/full-reports-sampled-expected.txt index 8a8a0f5cc854..8e117b289467 100644 --- a/memory/replace/dmd/test/full-reports-sampled-expected.txt +++ b/memory/replace/dmd/test/full-reports-sampled-expected.txt @@ -16,8 +16,8 @@ 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 ... } @@ -26,8 +26,8 @@ Unreported { 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 ... } @@ -35,9 +35,9 @@ Unreported { 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 ... } @@ -46,8 +46,8 @@ Unreported { 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 ... } @@ -56,8 +56,8 @@ Unreported { 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 ... } @@ -66,8 +66,8 @@ Unreported { 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 ... } @@ -76,8 +76,8 @@ Unreported { 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 ... } @@ -90,8 +90,8 @@ Unreported { #----------------------------------------------------------------- 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%) }