Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

catpure caller information to display in the exception if uncaught and verbose is set

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@25177 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jband%netscape.com 1999-03-26 01:31:16 +00:00
parent 0070930ea8
commit 43305d4d95
2 changed files with 57 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/js/src/xpconnect/src/xpcprivate.h
View File

@ -36,6 +36,7 @@
#include "jsapi.h"
#include "jshash.h"
#include "jsprf.h"
#include "jsdbgapi.h"
#include "xpt_cpp.h"
#include "xpcforwards.h"
#include "xpclog.h"
@ -121,13 +122,13 @@ public:
JSObject* GetGlobalObject() const {return mGlobalObj;}
nsXPConnect* GetXPConnect() const {return mXPConnect;}
JSObject2WrappedJSMap* GetWrappedJSMap() const
JSObject2WrappedJSMap* GetWrappedJSMap() const
{return mWrappedJSMap;}
Native2WrappedNativeMap* GetWrappedNativeMap() const
Native2WrappedNativeMap* GetWrappedNativeMap() const
{return mWrappedNativeMap;}
IID2WrappedJSClassMap* GetWrappedJSClassMap() const
IID2WrappedJSClassMap* GetWrappedJSClassMap() const
{return mWrappedJSClassMap;}
IID2WrappedNativeClassMap* GetWrappedNativeClassMap() const
IID2WrappedNativeClassMap* GetWrappedNativeClassMap() const
{return mWrappedNativeClassMap;}
jsid GetConstructorStrID() const {return mConstuctorStrID;}
@ -180,19 +181,19 @@ struct XPCJSError
class XPCJSThrower
{
public:
void ThrowBadResultException(JSContext* cx,
void ThrowBadResultException(JSContext* cx,
nsXPCWrappedNativeClass* clazz,
const XPCNativeMemberDescriptor* desc,
nsresult result);
void ThrowBadParamException(uintN errNum,
JSContext* cx,
JSContext* cx,
nsXPCWrappedNativeClass* clazz,
const XPCNativeMemberDescriptor* desc,
uintN paramNum);
void ThrowException(uintN errNum,
JSContext* cx,
JSContext* cx,
nsXPCWrappedNativeClass* clazz,
const XPCNativeMemberDescriptor* desc);
@ -201,10 +202,13 @@ public:
private:
void Verbosify(nsXPCWrappedNativeClass* clazz,
void Verbosify(JSContext* cx,
nsXPCWrappedNativeClass* clazz,
const XPCNativeMemberDescriptor* desc,
char** psz, PRBool own);
char* BuildCallerString(JSContext* cx);
private:
static XPCJSErrorFormatString default_formats[XPCJSError::LIMIT+1];
XPCJSErrorFormatString* mFormats;
@ -474,21 +478,21 @@ private:
nsXPCWrappedNativeClass(XPCContext* xpcc, REFNSIID aIID,
nsIInterfaceInfo* aInfo);
void ThrowBadResultException(JSContext* cx,
void ThrowBadResultException(JSContext* cx,
const XPCNativeMemberDescriptor* desc,
nsresult result)
{nsXPConnect::GetJSThrower()->
ThrowBadResultException(cx, this, desc, result);}
void ThrowBadParamException(uintN errNum,
JSContext* cx,
JSContext* cx,
const XPCNativeMemberDescriptor* desc,
uintN paramNum)
{nsXPConnect::GetJSThrower()->
ThrowBadParamException(errNum, cx, this, desc, paramNum);}
void ThrowException(uintN errNum,
JSContext* cx,
JSContext* cx,
const XPCNativeMemberDescriptor* desc)
{nsXPConnect::GetJSThrower()->
ThrowException(errNum, cx, this, desc);}

56
mozilla/js/src/xpconnect/src/xpcthrower.cpp
View File

@ -33,18 +33,46 @@ XPCJSThrower::XPCJSThrower(JSBool Verbose /*= JS_FALSE*/)
XPCJSThrower::~XPCJSThrower() {}
char*
XPCJSThrower::BuildCallerString(JSContext* cx)
{
JSStackFrame* iter = NULL;
JSStackFrame* fp;
while(NULL != (fp = JS_FrameIterator(cx, &iter)) )
{
JSScript* script = JS_GetFrameScript(cx, fp);
jsbytecode* pc = JS_GetFramePC(cx, fp);
if(!script || !pc || JS_IsNativeFrame(cx, fp))
continue;
const char* filename = JS_GetScriptFilename(cx, script);
return JS_smprintf("{file: %s, line: %d}",
filename ? filename : "<unknown>",
JS_PCToLineNumber(cx, script, pc));
}
return NULL;
}
void
XPCJSThrower::Verbosify(nsXPCWrappedNativeClass* clazz,
XPCJSThrower::Verbosify(JSContext* cx,
nsXPCWrappedNativeClass* clazz,
const XPCNativeMemberDescriptor* desc,
char** psz, PRBool own)
{
char* sz = NULL;
char* caller_string = BuildCallerString(cx);
if(clazz && desc)
sz = JS_smprintf("%s [%s.%s]",
*psz,
sz = JS_smprintf("%s [%s.%s, %s]",
*psz,
clazz->GetInterfaceName(),
clazz->GetMemberName(desc));
clazz->GetMemberName(desc),
caller_string ? caller_string : "");
if(caller_string)
JS_smprintf_free(caller_string);
if(sz)
{
if(own)
@ -53,8 +81,8 @@ XPCJSThrower::Verbosify(nsXPCWrappedNativeClass* clazz,
}
}
void
XPCJSThrower::ThrowBadResultException(JSContext* cx,
void
XPCJSThrower::ThrowBadResultException(JSContext* cx,
nsXPCWrappedNativeClass* clazz,
const XPCNativeMemberDescriptor* desc,
nsresult result)
@ -68,7 +96,7 @@ XPCJSThrower::ThrowBadResultException(JSContext* cx,
sz = JS_smprintf("%s %x", format, result);
if(sz && mVerbose)
Verbosify(clazz, desc, &sz, PR_TRUE);
Verbosify(cx, clazz, desc, &sz, PR_TRUE);
if(sz)
{
@ -82,9 +110,9 @@ XPCJSThrower::ThrowBadResultException(JSContext* cx,
JS_ReportOutOfMemory(cx);
}
void
void
XPCJSThrower::ThrowBadParamException(uintN errNum,
JSContext* cx,
JSContext* cx,
nsXPCWrappedNativeClass* clazz,
const XPCNativeMemberDescriptor* desc,
uintN paramNum)
@ -98,7 +126,7 @@ XPCJSThrower::ThrowBadParamException(uintN errNum,
sz = JS_smprintf("%s arg %d", format, paramNum);
if(sz && mVerbose)
Verbosify(clazz, desc, &sz, PR_TRUE);
Verbosify(cx, clazz, desc, &sz, PR_TRUE);
if(sz)
{
@ -112,9 +140,9 @@ XPCJSThrower::ThrowBadParamException(uintN errNum,
JS_ReportOutOfMemory(cx);
}
void
void
XPCJSThrower::ThrowException(uintN errNum,
JSContext* cx,
JSContext* cx,
nsXPCWrappedNativeClass* clazz,
const XPCNativeMemberDescriptor* desc)
{
@ -126,7 +154,7 @@ XPCJSThrower::ThrowException(uintN errNum,
sz = (char*) format;
if(sz && mVerbose)
Verbosify(clazz, desc, &sz, PR_FALSE);
Verbosify(cx, clazz, desc, &sz, PR_FALSE);
if(sz)
{
@ -139,4 +167,4 @@ XPCJSThrower::ThrowException(uintN errNum,
JS_SetPendingException(cx, STRING_TO_JSVAL(str));
else
JS_ReportOutOfMemory(cx);
}
}