wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1007534 - Part 5: Support memory files in CrashSubmit.jsm. r=ted

Browse Source
This commit is contained in:
David Major 2014-08-30 17:21:25 +12:00
parent 7d5ca445e0
commit 0c29a79073
3 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
toolkit/crashreporter/CrashSubmit.jsm
View File

@ -101,9 +101,11 @@ function getPendingMinidump(id) {
let pendingDir = getDir("pending");
let dump = pendingDir.clone();
let extra = pendingDir.clone();
let memory = pendingDir.clone();
dump.append(id + ".dmp");
extra.append(id + ".extra");
return [dump, extra];
memory.append(id + ".memory.json.gz");
return [dump, extra, memory];
}
function getAllPendingMinidumpsIDs() {
@ -162,6 +164,13 @@ function pruneSavedDumps() {
let dump = extra.clone();
dump.leafName = matches[1] + '.dmp';
dump.remove(false);
let memory = extra.clone();
memory.leafName = matches[1] + '.memory.json.gz';
if (memory.exists()) {
memory.remove(false);
}
extra.remove(false);
}
}
@ -206,6 +215,11 @@ Submitter.prototype = {
try {
this.dump.remove(false);
this.extra.remove(false);
if (this.memory) {
this.memory.remove(false);
}
for (let i of this.additionalDumps) {
i.dump.remove(false);
}
@ -225,6 +239,7 @@ Submitter.prototype = {
this.iframe = null;
this.dump = null;
this.extra = null;
this.memory = null;
this.additionalDumps = null;
// remove this object from the list of active submissions
let idx = CrashSubmit._activeSubmissions.indexOf(this);
@ -271,6 +286,9 @@ Submitter.prototype = {
}
// add the minidumps
formData.append("upload_file_minidump", File(this.dump.path));
if (this.memory) {
formData.append("memory_report", File(this.memory.path));
}
if (this.additionalDumps.length > 0) {
let names = [];
for (let i of this.additionalDumps) {
@ -353,12 +371,20 @@ Submitter.prototype = {
submit: function Submitter_submit()
{
let [dump, extra] = getPendingMinidump(this.id);
let [dump, extra, memory] = getPendingMinidump(this.id);
if (!dump.exists() || !extra.exists()) {
this.notifyStatus(FAILED);
this.cleanup();
return false;
}
this.dump = dump;
this.extra = extra;
// The memory file may or may not exist
if (memory.exists()) {
this.memory = memory;
}
let extraKeyVals = parseKeyValuePairsFromFile(extra);
for (let key in extraKeyVals) {
@ -371,7 +397,7 @@ Submitter.prototype = {
if ("additional_minidumps" in this.extraKeyVals) {
let names = this.extraKeyVals.additional_minidumps.split(',');
for (let name of names) {
let [dump, extra] = getPendingMinidump(this.id + "-" + name);
let [dump, extra, memory] = getPendingMinidump(this.id + "-" + name);
if (!dump.exists()) {
this.notifyStatus(FAILED);
this.cleanup();
@ -383,8 +409,6 @@ Submitter.prototype = {
this.notifyStatus(SUBMITTING);
this.dump = dump;
this.extra = extra;
this.additionalDumps = additionalDumps;
if (!this.submitForm()) {
@ -467,9 +491,12 @@ this.CrashSubmit = {
* Filename (minus .dmp extension) of the minidump to delete.
*/
delete: function CrashSubmit_delete(id) {
let [dump, extra] = getPendingMinidump(id);
dump.QueryInterface(Ci.nsIFile).remove(false);
extra.QueryInterface(Ci.nsIFile).remove(false);
let [dump, extra, memory] = getPendingMinidump(id);
dump.remove(false);
extra.remove(false);
if (memory.exists()) {
memory.remove(false);
}
},
/**

3
toolkit/crashreporter/test/browser/browser_aboutCrashesResubmit.js
View File

@ -56,10 +56,13 @@ function check_submit_pending(tab, crashes) {
// check the JSON content vs. what we submitted
let result = JSON.parse(browser.contentDocument.documentElement.textContent);
is(result.upload_file_minidump, "MDMP", "minidump file sent properly");
is(result.memory_report, "Let's pretend this is a memory report",
"memory report sent properly");
is(result.Throttleable, 0, "correctly sent as non-throttleable");
// we checked these, they're set by the submission process,
// so they won't be in the "extra" data.
delete result.upload_file_minidump;
delete result.memory_report;
delete result.Throttleable;
// Likewise, this is discarded before it gets to the server
delete SubmittedCrash.extra.ServerURL;

4
toolkit/crashreporter/test/browser/head.js
View File

@ -129,7 +129,11 @@ function addPendingCrashreport(crD, date, extra) {
extradata += x + "=" + extra[x] + "\n";
}
writeDataToFile(extrafile, extradata);
let memoryfile = pendingdir.clone();
memoryfile.append(uuid + ".memory.json.gz");
writeDataToFile(memoryfile, "Let's pretend this is a memory report");
dumpfile.lastModifiedTime = date;
extrafile.lastModifiedTime = date;
memoryfile.lastModifiedTime = date;
return {'id': uuid, 'date': date, 'pending': true, 'extra': extra};
}