Bug 1001137 - Use proper pref for configuring fifo directory. r=froydnj
authorEric Rahm <erahm@mozilla.com>
Fri, 25 Apr 2014 13:53:01 -0700
changeset 199898 950fadd70f9ebde26828cbb6999f3e0e5784e32c
parent 199897 6b04f015e541e07ff631ac18473824f7fb065755
child 199899 2f0714c1413b30e8b7be060a6bbab47a8a6fe90a
push id486
push userasasaki@mozilla.com
push dateMon, 14 Jul 2014 18:39:42 +0000
treeherdermozilla-release@d33428174ff1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1001137
milestone31.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 1001137 - Use proper pref for configuring fifo directory. r=froydnj
xpcom/base/nsDumpUtils.cpp
--- a/xpcom/base/nsDumpUtils.cpp
+++ b/xpcom/base/nsDumpUtils.cpp
@@ -237,17 +237,18 @@ void SignalPipeWatcher::OnFileCanReadWit
 
 StaticRefPtr<FifoWatcher> FifoWatcher::sSingleton;
 
 /* static */ FifoWatcher*
 FifoWatcher::GetSingleton()
 {
   if (!sSingleton) {
     nsAutoCString dirPath;
-    Preferences::GetCString(kPrefName, &dirPath);
+    Preferences::GetCString(
+      "memory_info_dumper.watch_fifo.directory", &dirPath);
     sSingleton = new FifoWatcher(dirPath);
     sSingleton->Init();
     ClearOnShutdown(&sSingleton);
   }
   return sSingleton;
 }
 
 /* static */ bool
@@ -256,17 +257,17 @@ FifoWatcher::MaybeCreate()
   MOZ_ASSERT(NS_IsMainThread());
 
   if (XRE_GetProcessType() != GeckoProcessType_Default) {
     // We want this to be main-process only, since two processes can't listen
     // to the same fifo.
     return false;
   }
 
-  if (!Preferences::GetBool("memory_info_dumper.watch_fifo.enabled", false)) {
+  if (!Preferences::GetBool(kPrefName, false)) {
     LOG("Fifo watcher disabled via pref.");
     return false;
   }
 
   // The FifoWatcher is held alive by the observer service.
   if (!sSingleton) {
     GetSingleton();
   }