Bug 717092 - Rename pref 'low_physical_mem_threshold_mb' to 'low_physical_memory_threshold_mb', for consistency with the other low-memory prefs. r=njn
authorJustin Lebar <justin.lebar@gmail.com>
Wed, 11 Jan 2012 11:11:32 -0500
changeset 85516 dc3f10e2e734bc0b4dd389d60ad536644f09c74d
parent 85515 39e49fcaed223e445a19760bb3974a3958b56178
child 85517 fd544d5c7967420f33f5885f3d6f503860725b8d
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnjn
bugs717092
milestone12.0a1
Bug 717092 - Rename pref 'low_physical_mem_threshold_mb' to 'low_physical_memory_threshold_mb', for consistency with the other low-memory prefs. r=njn
modules/libpref/src/init/all.js
xpcom/base/AvailableMemoryTracker.cpp
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -3409,15 +3409,15 @@ pref("profiler.entries", 100000);
 
 #ifdef XP_WIN
 // On 32-bit Windows, fire a low-memory notification if we have less than this
 // many mb of virtual address space available.
 pref("memory.low_virtual_memory_threshold_mb", 128);
 
 // On Windows 32- or 64-bit, fire a low-memory notification if we have less
 // than this many mb of physical memory available on the whole machine.
-pref("memory.low_physical_mem_threshold_mb", 0);
+pref("memory.low_physical_memory_threshold_mb", 0);
 
 // On Windows 32- or 64-bit, don't fire a low-memory notification because of
 // low available physical memory more than once every
 // low_physical_memory_notification_interval_ms.
 pref("memory.low_physical_memory_notification_interval_ms", 10000);
 #endif
--- a/xpcom/base/AvailableMemoryTracker.cpp
+++ b/xpcom/base/AvailableMemoryTracker.cpp
@@ -409,25 +409,25 @@ public:
   NS_IMETHOD GetDescription(nsACString &aDescription)
   {
     aDescription.AssignLiteral(
       "Number of low-physical-memory events fired since startup. ");
 
     if (sLowPhysicalMemoryThreshold == 0 || !sHooksInstalled) {
       aDescription.Append(nsPrintfCString(1024,
         "Tracking low-physical-memory events is disabled, but you can enable it "
-        "by giving the memory.low_physical_mem_threshold_mb pref a non-zero "
+        "by giving the memory.low_physical_memory_threshold_mb pref a non-zero "
         "value%s.",
         sHooksInstalled ? "" : " and restarting"));
     }
     else {
       aDescription.Append(nsPrintfCString(1024,
         "We fire such an event if we notice there is less than %d MB of "
         "available physical memory (controlled by the "
-        "'memory.low_physical_mem_threshold_mb' pref).  The machine will start "
+        "'memory.low_physical_memory_threshold_mb' pref).  The machine will start "
         "to page if it runs out of physical memory; this may cause it to run "
         "slowly, but it shouldn't cause us to crash.",
         sLowPhysicalMemoryThreshold));
     }
     return NS_OK;
   }
 };
 
@@ -446,17 +446,17 @@ void Init()
     sLowVirtualMemoryThreshold = 0;
   }
   else {
     Preferences::AddUintVarCache(&sLowVirtualMemoryThreshold,
         "memory.low_virtual_mem_threshold_mb", 128);
   }
 
   Preferences::AddUintVarCache(&sLowPhysicalMemoryThreshold,
-      "memory.low_physical_mem_threshold_mb", 0);
+      "memory.low_physical_memory_threshold_mb", 0);
   Preferences::AddUintVarCache(&sLowPhysicalMemoryNotificationIntervalMS,
       "memory.low_physical_memory_notification_interval_ms", 10000);
 
   // Don't register the hooks if we're a build instrumented for PGO or if both
   // thresholds are 0.  (If we're an instrumented build, the compiler adds
   // function calls all over the place which may call VirtualAlloc; this makes
   // it hard to prevent VirtualAllocHook from reentering itself.)