Skip to content

Added JS stack trace #20168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 29, 2019
+22 −0
Merged

Added JS stack trace #20168

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6378ba
Added JS stack trace
vyshnavsdeepak Sep 24, 2019
96cd4cd
Added JS stack trace
vyshnavsdeepak Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions cocos/scripting/js-bindings/manual/ScriptingCore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,20 @@ static void ReportException(JSContext *cx)
}
}

static void errorHandler(JSContext *cx, const char *message, JSErrorReport *report) {

if (cx && report)
{
JS::RootedValue errorContext(cx);
if (JS_GetPendingException(cx, &errorContext))
{
JS_ClearPendingException(cx);
}
ScriptingCore::reportError(cx, message, report, errorContext)
}

}

static void onGarbageCollect(JSRuntime* rt, JSGCStatus status, void* data)
{
/* We finalize any pending toggle refs before doing any garbage collection,
Expand Down Expand Up @@ -642,7 +656,7 @@ void ScriptingCore::createGlobalContext() {
JS::RuntimeOptionsRef(_rt).setIon(true);
JS::RuntimeOptionsRef(_rt).setBaseline(true);

JS_SetErrorReporter(_cx, ScriptingCore::reportError);
JS_SetErrorReporter(_cx, errorHandler);
#if defined(JS_GC_ZEAL) && defined(DEBUG)
JS_SetGCZeal(this->_cx, 2, JS_DEFAULT_ZEAL_FREQ);
#endif
Expand Down Expand Up @@ -934,12 +948,25 @@ void ScriptingCore::cleanup()
_needCleanup = false;
}

void ScriptingCore::reportError(JSContext *cx, const char *message, JSErrorReport *report)
void ScriptingCore::reportError(JSContext *cx, const char *message, JSErrorReport *report, JS::HandleValue errorContext)
{
js_log("%s:%u:%s\n",
report->filename ? report->filename : "<no filename=\"filename\">",
(unsigned int) report->lineno,
message);
if (errorContext.isObject())
{
std::string stackStr = "";
JS::RootedObject errObj(cx, errorContext.toObjectOrNull());
JS::RootedValue stack(cx);
if (JS_GetProperty(cx, errObj, "stack", &stack) && stack.isString())
{
JS::RootedString jsstackStr(cx, stack.toString());
stackStr = JS_EncodeStringToUTF8(cx, jsstackStr);
js_log("Stack: %s\n", stackStr.c_str());
}
}

}


Expand Down
3 changes: 2 additions & 1 deletion cocos/scripting/js-bindings/manual/ScriptingCore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,9 @@ class CC_JS_DLL ScriptingCore : public cocos2d::ScriptEngineProtocol
* @param cx @~english The js context
* @param message @~english The error message
* @param report @~english The js error report object
* @param errorContext @~english Relevant js context object
*/
static void reportError(JSContext *cx, const char *message, JSErrorReport *report);
static void reportError(JSContext *cx, const char *message, JSErrorReport *report, JS::HandleValue errorContext);

/**@~english
* Log something to the js context using CCLog.
Expand Down