Back out Bug 1071359 for using 8 MB (!?!) of memory per process on b2g. r=me a=me
authorKyle Huey <khuey@kylehuey.com>
Mon, 29 Sep 2014 15:43:04 -0700
changeset 207775 7c24470b6b3aace8d17bb3c218cd8c6598017245
parent 207774 6eb7121059fb6bbb6a8b3e5faadb5752b53a4f4e
child 207859 4475aa556e69f7bd69f16263eb108a89252d5035
push id27567
push userkhuey@mozilla.com
push dateMon, 29 Sep 2014 22:43:49 +0000
treeherdermozilla-central@7c24470b6b3a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, me
bugs1071359
milestone35.0a1
first release with
nightly linux32
7c24470b6b3a / 35.0a1 / 20140930030202 / files
nightly linux64
7c24470b6b3a / 35.0a1 / 20140930030202 / files
nightly mac
7c24470b6b3a / 35.0a1 / 20140930030202 / files
nightly win32
7c24470b6b3a / 35.0a1 / 20140930030202 / files
nightly win64
7c24470b6b3a / 35.0a1 / 20140930030202 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out Bug 1071359 for using 8 MB (!?!) of memory per process on b2g. r=me a=me
media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp
media/webrtc/trunk/webrtc/build/common.gypi
--- a/media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp
+++ b/media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp
@@ -2,19 +2,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "WebRtcLog.h"
 
 #include "prlog.h"
 #include "prenv.h"
 #include "webrtc/system_wrappers/interface/trace.h"
-#ifdef WEBRTC_GONK
-#include "webrtc/system_wrappers/interface/logcat_trace_context.h"
-#endif
 
 #include "nscore.h"
 #ifdef MOZILLA_INTERNAL_API
 #include "nsString.h"
 #include "mozilla/Preferences.h"
 #else
 #include "nsStringAPI.h"
 #endif
@@ -51,20 +48,16 @@ public:
 #ifdef PR_LOGGING
     PRLogModuleInfo *log = GetWebRtcTraceLog();
     PR_LOG(log, PR_LOG_DEBUG, ("%s", message));
 #endif
   }
 };
 
 static WebRtcTraceCallback gWebRtcCallback;
-#ifdef WEBRTC_GONK
-static webrtc::LogcatTraceContext gWebRtcLogcatCallback;
-#endif
-
 
 #ifdef MOZILLA_INTERNAL_API
 void GetWebRtcLogPrefs(uint32_t *aTraceMask, nsACString* aLogFile, nsACString *aAECLogDir, bool *aMultiLog)
 {
   *aMultiLog = mozilla::Preferences::GetBool("media.webrtc.debug.multi_log");
   *aTraceMask = mozilla::Preferences::GetUint("media.webrtc.debug.trace_mask");
   mozilla::Preferences::GetCString("media.webrtc.debug.log_file", aLogFile);
   mozilla::Preferences::GetCString("media.webrtc.debug.aec_log_dir", aAECLogDir);
@@ -117,23 +110,18 @@ void ConfigWebRtcLog(uint32_t trace_mask
     logFile.Assign(default_log);
   } else {
     logFile.Assign(temp_dir);
     logFile.Append('/');
     aecLogDir = logFile;
     logFile.Append(default_log);
   }
 #elif defined(ANDROID)
-#ifdef WEBRTC_GONK
-  // Special case: use callback to log through logcat.
-  logFile.Assign("logcat");
-#else
   // Special case: use callback to pipe to NSPR logging.
   logFile.Assign("nspr");
-#endif
   // for AEC, force the user to specify a directory
   aecLogDir.Assign("/dev/null");
 #else
   // UNIX-like place for the others
   logFile.Assign("/tmp/");
   aecLogDir = logFile;
   logFile.Append(default_log);
 #endif
@@ -144,20 +132,16 @@ void ConfigWebRtcLog(uint32_t trace_mask
     aAECLogDir = aecLogDir;
   }
 
   webrtc::Trace::set_level_filter(trace_mask);
   webrtc::Trace::set_aec_debug_filename(aAECLogDir.get());
   if (trace_mask != 0) {
     if (aLogFile.EqualsLiteral("nspr")) {
       webrtc::Trace::SetTraceCallback(&gWebRtcCallback);
-#ifdef WEBRTC_GONK
-    } else if (aLogFile.EqualsLiteral("logcat")) {
-      webrtc::Trace::SetTraceCallback(&gWebRtcLogcatCallback);
-#endif
     } else {
       webrtc::Trace::SetTraceFile(aLogFile.get(), multi_log);
     }
   }
   return;
 }
 
 void StartWebRtcLog(uint32_t log_level)
--- a/media/webrtc/trunk/webrtc/build/common.gypi
+++ b/media/webrtc/trunk/webrtc/build/common.gypi
@@ -183,17 +183,16 @@
       # To include the top-level directory when building in Chrome, so we can
       # use full paths (e.g. headers inside testing/ or third_party/).
       '<(DEPTH)',
     ],
     'conditions': [
       ['moz_widget_toolkit_gonk==1', {
         'defines' : [
           'WEBRTC_GONK',
-          'WEBRTC_DIRECT_TRACE',
         ],
       }],
       ['restrict_webrtc_logging==1', {
         'defines': ['WEBRTC_RESTRICT_LOGGING',],
       }],
       ['build_with_mozilla==1', {
         'defines': [
           # Changes settings for Mozilla build.