From 47dfb099773dd0b30b6add0b9433b587ceba4618 Mon Sep 17 00:00:00 2001 From: Markus Stange Date: Fri, 11 May 2018 23:18:44 -0400 Subject: [PATCH] Bug 1461056 - Remove the "remoteBreakpad" symbol rule, because it's no longer needed. r=dthayer MozReview-Commit-ID: 6c2hWCtZ0UH --HG-- extra : rebase_source : 36870f7f33172b0b3e0584604d8556eeb36cfa35 --- browser/app/profile/firefox.js | 4 ++-- .../extensions/ParseBreakpadSymbols-worker.js | 12 ------------ .../extensions/parent/ext-geckoProfiler.js | 9 +-------- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 6abaa62c44ab..7bbd04ca9efe 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -66,9 +66,9 @@ pref("extensions.startupScanScopes", 0); pref("extensions.geckoProfiler.symbols.url", "http://symbols.mozilla.org/"); pref("extensions.geckoProfiler.acceptedExtensionIds", "geckoprofiler@mozilla.com,quantum-foxfooding@mozilla.com"); #if defined(XP_LINUX) || defined (XP_MACOSX) -pref("extensions.geckoProfiler.getSymbolRules", "localBreakpad,remoteBreakpad,nm"); +pref("extensions.geckoProfiler.getSymbolRules", "localBreakpad,nm"); #else // defined(XP_WIN) -pref("extensions.geckoProfiler.getSymbolRules", "localBreakpad,remoteBreakpad,dump_syms.exe"); +pref("extensions.geckoProfiler.getSymbolRules", "localBreakpad,dump_syms.exe"); #endif diff --git a/browser/components/extensions/ParseBreakpadSymbols-worker.js b/browser/components/extensions/ParseBreakpadSymbols-worker.js index 909883d7b5da..702baf64b2d3 100644 --- a/browser/components/extensions/ParseBreakpadSymbols-worker.js +++ b/browser/components/extensions/ParseBreakpadSymbols-worker.js @@ -7,16 +7,6 @@ importScripts("resource://gre/modules/osfile.jsm"); importScripts("resource:///modules/ParseSymbols.jsm"); -async function fetchSymbolFile(url) { - const response = await fetch(url); - - if (!response.ok) { - throw new Error(`got error status ${response.status}`); - } - - return response.text(); -} - function parse(text) { const syms = new Map(); @@ -45,8 +35,6 @@ onmessage = async e => { let text; if (e.data.filepath) { text = await OS.File.read(e.data.filepath, {encoding: "utf-8"}); - } else if (e.data.url) { - text = await fetchSymbolFile(e.data.url); } else if (e.data.textBuffer) { text = (new TextDecoder()).decode(e.data.textBuffer); } diff --git a/browser/components/extensions/parent/ext-geckoProfiler.js b/browser/components/extensions/parent/ext-geckoProfiler.js index 1a0ef764c621..d7c12312be1b 100644 --- a/browser/components/extensions/parent/ext-geckoProfiler.js +++ b/browser/components/extensions/parent/ext-geckoProfiler.js @@ -400,15 +400,13 @@ this.geckoProfiler = class extends ExtensionAPI { const cachedLibInfo = symbolCache.get(urlForSymFile(debugName, breakpadId)); - const symbolRules = Services.prefs.getCharPref(PREF_GET_SYMBOL_RULES, "localBreakpad,remoteBreakpad"); + const symbolRules = Services.prefs.getCharPref(PREF_GET_SYMBOL_RULES, "localBreakpad"); const haveAbsolutePath = cachedLibInfo && OS.Path.split(cachedLibInfo.path).absolute; // We have multiple options for obtaining symbol information for the given // binary. // "localBreakpad" - Use existing symbol dumps stored in the object directory of a local // Firefox build, generated using `mach buildsymbols` [requires path] - // "remoteBreakpad" - Use symbol dumps from the Mozilla symbol server [only requires - // debugName + breakpadId] // "nm" - Use the command line tool `nm` [linux/mac only, requires path] // "dump_syms.exe" - Use the tool dump_syms.exe from the object directory [Windows // only, requires path] @@ -427,9 +425,6 @@ this.geckoProfiler = class extends ExtensionAPI { } } break; - case "remoteBreakpad": - const url = urlForSymFile(debugName, breakpadId); - return await parseSym({url}); case "nm": if (haveAbsolutePath) { const {path, arch} = cachedLibInfo; @@ -461,8 +456,6 @@ this.geckoProfiler = class extends ExtensionAPI { // we will try the next one. // "localBreakpad" will fail if this is not a local build that's running from the object // directory or if the user hasn't run `mach buildsymbols` on it. - // "remoteBreakpad" will fail if this is not an official mozilla build (e.g. Nightly) or a - // known system library. // "nm" will fail if `nm` is not available. // "dump_syms.exe" will fail if this is not a local build that's running from the object // directory, or if dump_syms.exe doesn't exist in the object directory, or if