Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add information to stack trace format so it can be processed by addr2line. b=59136

Browse Source 
Make logging not crash when dll unloading is enabled.  b=60710
r=waterson@netscape.com  sr=brendan@mozilla.org
This commit is contained in:
dbaron%fas.harvard.edu 2000-12-02 16:10:50 +00:00
parent b044086bf2
commit 3a40e42717
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xpcom/base/nsTraceRefcnt.cpp
View File

@ -191,13 +191,16 @@ struct GatherArgs {
class BloatEntry {
public:
BloatEntry(const char* className, PRUint32 classSize)
: mClassName(className), mClassSize(classSize) {
: mClassSize(classSize) {
mClassName = PL_strdup(className);
Clear(&mNewStats);
Clear(&mAllStats);
mTotalLeaked = 0;
}
~BloatEntry() {}
~BloatEntry() {
PL_strfree(mClassName);
}
PRUint32 GetClassSize() { return (PRUint32)mClassSize; }
const char* GetClassName() { return mClassName; }
@ -382,7 +385,7 @@ public:
}
protected:
const char* mClassName;
char* mClassName;
double mClassSize; // this is stored as a double because of the way we compute the avg class size for total bloat
PRInt32 mTotalLeaked; // used only for TOTAL entry
nsTraceRefcntStats mNewStats;
@ -1039,7 +1042,7 @@ nsTraceRefcnt::WalkTheStack(FILE* aStream)
Dl_info info;
int ok = dladdr((void*) pc, &info);
if (!ok) {
fprintf(aStream, "UNKNOWN 0x%8p\n", (char*)pc);
fprintf(aStream, "UNKNOWN %p\n", (void *)pc);
bp = nextbp;
continue;
}
@ -1060,7 +1063,9 @@ nsTraceRefcnt::WalkTheStack(FILE* aStream)
}
PRUint32 off = (char*)pc - (char*)info.dli_saddr;
fprintf(aStream, "%s+0x%08X\n", symbol, off);
PRUint32 foff = (char*)pc - (char*)info.dli_fbase;
fprintf(aStream, "%s+0x%08X [%s +0x%08X]\n",
symbol, off, info.dli_fname, foff);
}
bp = nextbp;
}

15
xpcom/base/nsTraceRefcntImpl.cpp
View File

@ -191,13 +191,16 @@ struct GatherArgs {
class BloatEntry {
public:
BloatEntry(const char* className, PRUint32 classSize)
: mClassName(className), mClassSize(classSize) {
: mClassSize(classSize) {
mClassName = PL_strdup(className);
Clear(&mNewStats);
Clear(&mAllStats);
mTotalLeaked = 0;
}
~BloatEntry() {}
~BloatEntry() {
PL_strfree(mClassName);
}
PRUint32 GetClassSize() { return (PRUint32)mClassSize; }
const char* GetClassName() { return mClassName; }
@ -382,7 +385,7 @@ public:
}
protected:
const char* mClassName;
char* mClassName;
double mClassSize; // this is stored as a double because of the way we compute the avg class size for total bloat
PRInt32 mTotalLeaked; // used only for TOTAL entry
nsTraceRefcntStats mNewStats;
@ -1039,7 +1042,7 @@ nsTraceRefcnt::WalkTheStack(FILE* aStream)
Dl_info info;
int ok = dladdr((void*) pc, &info);
if (!ok) {
fprintf(aStream, "UNKNOWN 0x%8p\n", (char*)pc);
fprintf(aStream, "UNKNOWN %p\n", (void *)pc);
bp = nextbp;
continue;
}
@ -1060,7 +1063,9 @@ nsTraceRefcnt::WalkTheStack(FILE* aStream)
}
PRUint32 off = (char*)pc - (char*)info.dli_saddr;
fprintf(aStream, "%s+0x%08X\n", symbol, off);
PRUint32 foff = (char*)pc - (char*)info.dli_fbase;
fprintf(aStream, "%s+0x%08X [%s +0x%08X]\n",
symbol, off, info.dli_fname, foff);
}
bp = nextbp;
}