Bug 1514043 - change gecko media plugin process name; r=mccr8,bobowen,haik,chutten
authorNathan Froyd <froydnj@mozilla.com>
Thu, 10 Jan 2019 10:52:51 -0500
changeset 453267 6d7562d605900b71a5553e368ababe8abb0b7d43
parent 453266 51c86d025ecb710b8d37d3454a1d0adcfff8f89d
child 453268 1abd03bcbfa3520c8c0263606c792183ddaa073d
push id35351
push userccoroiu@mozilla.com
push dateThu, 10 Jan 2019 21:42:10 +0000
treeherdermozilla-central@ed68c008e5d8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmccr8, bobowen, haik, chutten
bugs1514043
milestone66.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 1514043 - change gecko media plugin process name; r=mccr8,bobowen,haik,chutten The only visible change from this change is that telemetry will be discontinuous. The owners for the relevant telemetry probes have reviewed this and indicated that this discontinuity is OK.
testing/mochitest/mochitest_options.py
testing/mozbase/mozleak/mozleak/leaklog.py
testing/web-platform/meta/__dir__.ini
testing/web-platform/mozilla/meta/__dir__.ini
testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py
xpcom/build/nsXULAppAPI.h
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -593,19 +593,19 @@ class MochitestArguments(ArgumentContain
         [["--verify-max-time"],
          {"type": int,
           "default": 3600,
           "help": "Maximum time, in seconds, to run in --verify mode.",
           }],
     ]
 
     defaults = {
-        # Bug 1065098 - The geckomediaplugin process fails to produce a leak
+        # Bug 1065098 - The gmplugin process fails to produce a leak
         # log for some reason.
-        'ignoreMissingLeaks': ["geckomediaplugin"],
+        'ignoreMissingLeaks': ["gmplugin"],
         'extensionsToExclude': ['specialpowers'],
         # Set server information on the args object
         'webServer': '127.0.0.1',
         'httpPort': DEFAULT_PORTS['http'],
         'sslPort': DEFAULT_PORTS['https'],
         'webSocketPort': '9988',
         # The default websocket port is incorrect in mozprofile; it is
         # set to the SSL proxy setting. See:
@@ -820,17 +820,17 @@ class MochitestArguments(ArgumentContain
 
         if options.nested_oop:
             options.e10s = True
 
         options.leakThresholds = {
             "default": options.defaultLeakThreshold,
             "tab": options.defaultLeakThreshold,
             # GMP rarely gets a log, but when it does, it leaks a little.
-            "geckomediaplugin": 20000,
+            "gmplugin": 20000,
             "rdd": 400,
         }
 
         # See the dependencies of bug 1401764.
         if mozinfo.isWin:
             options.leakThresholds["tab"] = 1000
 
         # XXX We can't normalize test_paths in the non build_obj case here,
--- a/testing/mozbase/mozleak/mozleak/leaklog.py
+++ b/testing/mozbase/mozleak/mozleak/leaklog.py
@@ -159,17 +159,17 @@ def process_leak_log(leak_log_file, leak
     log.info("leakcheck | Processing log file %s%s" %
              (leakLogFile, (" for scope %s" % scope) if scope is not None else ""))
 
     leakThresholds = leak_thresholds or {}
     ignoreMissingLeaks = ignore_missing_leaks or []
 
     # This list is based on kGeckoProcessTypeString. ipdlunittest processes likely
     # are not going to produce leak logs we will ever see.
-    knownProcessTypes = ["default", "plugin", "tab", "geckomediaplugin", "gpu", "rdd"]
+    knownProcessTypes = ["default", "plugin", "tab", "gmplugin", "gpu", "rdd"]
 
     for processType in knownProcessTypes:
         log.info("TEST-INFO | leakcheck | %s process: leak threshold set at %d bytes"
                  % (processType, leakThresholds.get(processType, 0)))
 
     for processType in leakThresholds:
         if processType not in knownProcessTypes:
             log.error("TEST-UNEXPECTED-FAIL | leakcheck | "
--- a/testing/web-platform/meta/__dir__.ini
+++ b/testing/web-platform/meta/__dir__.ini
@@ -1,6 +1,6 @@
 lsan-allowed: [js_pod_malloc, js_pod_calloc, js_pod_realloc, js_arena_calloc,js_pod_arena_calloc, maybe_pod_calloc, pod_calloc, make_zeroed_pod_array, js_arena_malloc]
 leak-threshold:
-  if webrender: [tab:10000, gpu: 10000, geckomediaplugin:20000, default:16000]
-  if os == "mac": [tab:10000, geckomediaplugin:20000, default:2000, rdd:400]
-  [tab:10000, geckomediaplugin:20000, rdd:400]
+  if webrender: [tab:10000, gpu: 10000, gmplugin:20000, default:16000]
+  if os == "mac": [tab:10000, gmplugin:20000, default:2000, rdd:400]
+  [tab:10000, gmplugin:20000, rdd:400]
 
--- a/testing/web-platform/mozilla/meta/__dir__.ini
+++ b/testing/web-platform/mozilla/meta/__dir__.ini
@@ -1,6 +1,6 @@
 lsan-allowed: [Init, nsHostResolver::ResolveHost]
 leak-threshold:
-  if webrender: [tab:10000, geckomediaplugin:20000, default:16000]
-  if os == "mac": [tab:10000, geckomediaplugin:20000, default:2000, rdd:400]
-  [tab:10000, geckomediaplugin:20000, rdd:400]
+  if webrender: [tab:10000, gmplugin:20000, default:16000]
+  if os == "mac": [tab:10000, gmplugin:20000, default:2000, rdd:400]
+  [tab:10000, gmplugin:20000, rdd:400]
 
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -351,17 +351,17 @@ class FirefoxBrowser(Browser):
     def process_leaks(self):
         self.logger.info("PROCESS LEAKS %s" % self.leak_report_file)
         if self.lsan_handler:
             self.lsan_handler.process()
         if self.leak_report_file is not None:
             mozleak.process_leak_log(
                 self.leak_report_file,
                 leak_thresholds=self.mozleak_thresholds,
-                ignore_missing_leaks=["geckomediaplugin"],
+                ignore_missing_leaks=["gmplugin"],
                 log=self.logger,
                 stack_fixer=self.stack_fixer,
                 scope=self.group_metadata.get("scope"),
                 allowed=self.mozleak_allowed
             )
 
     def pid(self):
         if self.runner.process_handler is None:
--- a/xpcom/build/nsXULAppAPI.h
+++ b/xpcom/build/nsXULAppAPI.h
@@ -377,18 +377,18 @@ enum GeckoProcessType {
   GeckoProcessType_GPU,  // GPU and compositor process
   GeckoProcessType_VR,   // VR process
   GeckoProcessType_RDD,  // RDD (RemoteDataDecoder process)
   GeckoProcessType_End,
   GeckoProcessType_Invalid = GeckoProcessType_End
 };
 
 static const char* const kGeckoProcessTypeString[] = {
-    "default",          "plugin", "tab", "ipdlunittest",
-    "geckomediaplugin", "gpu",    "vr",  "rdd"};
+    "default",  "plugin", "tab", "ipdlunittest",
+    "gmplugin", "gpu",    "vr",  "rdd"};
 
 static_assert(MOZ_ARRAY_LENGTH(kGeckoProcessTypeString) == GeckoProcessType_End,
               "Array length mismatch");
 
 XRE_API(const char*, XRE_ChildProcessTypeToString,
         (GeckoProcessType aProcessType))
 
 #if defined(MOZ_WIDGET_ANDROID)