Skip to content

Fix timeline instrumentation in cpp code #1058

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 1 commit into from
May 14, 2018
Merged

Fix timeline instrumentation in cpp code #1058

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions test-app/runtime/src/main/cpp/Runtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ bool tns::LogEnabled = true;
SimpleAllocator g_allocator;

void SIGABRT_handler(int sigNumber) {
throw NativeScriptException("JNI Exception occurred (SIGABRT).\n=======\nCheck the 'adb logcat' for additional information about the error.\n=======\n");
throw NativeScriptException("JNI Exception occurred (SIGABRT).\n=======\nCheck the 'adb logcat' for additional information about the error.\n=======\n");
}

void Runtime::Init(JavaVM* vm, void* reserved) {
Expand All @@ -53,7 +53,7 @@ void Runtime::Init(JavaVM* vm, void* reserved) {
JEnv::Init(s_jvm);
}

if(m_androidVersion > 25) {
if (m_androidVersion > 25) {
// handle SIGABRT only on API level > 25 as the handling is not so efficient in older versions
struct sigaction action;
action.sa_handler = SIGABRT_handler;
Expand Down Expand Up @@ -508,10 +508,9 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, const string& native
InitializeV8();
}

tns::instrumentation::Frame isolateFrame("Isolate.New");
tns::instrumentation::Frame isolateFrame;
auto isolate = Isolate::New(create_params);
isolateFrame.log("Isolate.New");
isolateFrame.disable();

Isolate::Scope isolate_scope(isolate);
HandleScope handleScope(isolate);
Expand Down