Backed out 2 changesets (bug 1544651, bug 1544648) for bustages on Nursery.cpp . CLOSED TREE
authorNarcis Beleuzu <nbeleuzu@mozilla.com>
Wed, 17 Apr 2019 17:43:51 +0300
changeset 469849 b90fc7a65c3d61bbf14c98fd2baaf28014562ff0
parent 469848 f0ab962de2df6d04d26c2dd6665aeb11d0ce9820
child 469850 d6c9841c74cdc5cdb84becbd304afcdebf13a3cf
push id35883
push userbtara@mozilla.com
push dateWed, 17 Apr 2019 21:47:29 +0000
treeherdermozilla-central@02b89c29412b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1544651, 1544648
milestone68.0a1
backs out2f61be416873860b79506382e4bfc2e42fe87a97
7699a664586021eb0d1cd34d52304270397d213f
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
Backed out 2 changesets (bug 1544651, bug 1544648) for bustages on Nursery.cpp . CLOSED TREE Backed out changeset 2f61be416873 (bug 1544648) Backed out changeset 7699a6645860 (bug 1544651)
js/src/builtin/TestingFunctions.cpp
js/src/gc/Nursery.cpp
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -481,29 +481,20 @@ static bool MinorGC(JSContext* cx, unsig
   _("highFrequencyLowLimit", JSGC_HIGH_FREQUENCY_LOW_LIMIT, true)            \
   _("highFrequencyHighLimit", JSGC_HIGH_FREQUENCY_HIGH_LIMIT, true)          \
   _("highFrequencyHeapGrowthMax", JSGC_HIGH_FREQUENCY_HEAP_GROWTH_MAX, true) \
   _("highFrequencyHeapGrowthMin", JSGC_HIGH_FREQUENCY_HEAP_GROWTH_MIN, true) \
   _("lowFrequencyHeapGrowth", JSGC_LOW_FREQUENCY_HEAP_GROWTH, true)          \
   _("dynamicHeapGrowth", JSGC_DYNAMIC_HEAP_GROWTH, true)                     \
   _("dynamicMarkSlice", JSGC_DYNAMIC_MARK_SLICE, true)                       \
   _("allocationThreshold", JSGC_ALLOCATION_THRESHOLD, true)                  \
-  _("allocationThresholdFactor", JSGC_ALLOCATION_THRESHOLD_FACTOR, true)     \
-  _("allocationThresholdFactorAvoidInterrupt",                               \
-    JSGC_ALLOCATION_THRESHOLD_FACTOR_AVOID_INTERRUPT, true)                  \
   _("minEmptyChunkCount", JSGC_MIN_EMPTY_CHUNK_COUNT, true)                  \
   _("maxEmptyChunkCount", JSGC_MAX_EMPTY_CHUNK_COUNT, true)                  \
   _("compactingEnabled", JSGC_COMPACTING_ENABLED, true)                      \
-  _("minLastDitchGCPeriod", JSGC_MIN_LAST_DITCH_GC_PERIOD, true)             \
-  _("nurseryFreeThresholdForIdleCollection",                                 \
-    JSGC_NURSERY_FREE_THRESHOLD_FOR_IDLE_COLLECTION, true)                   \
-  _("nurseryFreeThresholdForIdleCollectionPercent",                          \
-    JSGC_NURSERY_FREE_THRESHOLD_FOR_IDLE_COLLECTION_PERCENT, true)           \
-  _("pretenureThreshold", JSGC_PRETENURE_THRESHOLD, true)                    \
-  _("pretenureGroupThreshold", JSGC_PRETENURE_GROUP_THRESHOLD, true)
+  _("minLastDitchGCPeriod", JSGC_MIN_LAST_DITCH_GC_PERIOD, true)
 
 static const struct ParamInfo {
   const char* name;
   JSGCParamKey param;
   bool writable;
 } paramMap[] = {
 #define DEFINE_PARAM_INFO(name, key, writable) {name, key, writable},
     FOR_EACH_GC_PARAM(DEFINE_PARAM_INFO)
--- a/js/src/gc/Nursery.cpp
+++ b/js/src/gc/Nursery.cpp
@@ -878,19 +878,18 @@ void js::Nursery::collect(JS::GCReason r
 
   stats().endNurseryCollection(reason);
   gcTracer.traceMinorGCEnd();
   timeInChunkAlloc_ = mozilla::TimeDuration();
 
   if (enableProfiling_ && totalTime >= profileThreshold_) {
     stats().maybePrintProfileHeaders();
 
-    fprintf(stderr, "MinorGC: %20s %5.1f%% %5lu       ",
-            JS::ExplainGCReason(reason), promotionRate * 100,
-            capacity() / 1024);
+    fprintf(stderr, "MinorGC: %20s %5.1f%% %4u        ",
+            JS::ExplainGCReason(reason), promotionRate * 100, maxChunkCount());
     printProfileDurations(profileDurations_);
 
     if (reportTenurings_) {
       for (auto& entry : tenureCounts.entries) {
         if (entry.count >= reportTenurings_) {
           fprintf(stderr, "  %d x ", entry.count);
           AutoSweepObjectGroup sweep(entry.group);
           entry.group->print(sweep);