Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion src/java.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#endif

threadId v8ThreadId;
bool isDefaultLoopRunning = false;

std::queue<DynamicProxyJsCallData *> queue_dynamicProxyJsCallData;
uv_mutex_t uvMutex_dynamicProxyJsCall;
Expand Down Expand Up @@ -78,9 +79,9 @@ void uvAsyncCb_dynamicProxyJsCall(uv_async_t *handle) {
Nan::HandleScope scope;

v8ThreadId = my_getThreadId();
isDefaultLoopRunning = false; //init as false

uv_mutex_init(&uvMutex_dynamicProxyJsCall);
uv_async_init(uv_default_loop(), &uvAsync_dynamicProxyJsCall, uvAsyncCb_dynamicProxyJsCall);

v8::Local<v8::FunctionTemplate> t = Nan::New<v8::FunctionTemplate>(New);
s_ct.Reset(t);
Expand All @@ -106,6 +107,7 @@ void uvAsyncCb_dynamicProxyJsCall(uv_async_t *handle) {
Nan::SetPrototypeMethod(t, "getStaticFieldValue", getStaticFieldValue);
Nan::SetPrototypeMethod(t, "setStaticFieldValue", setStaticFieldValue);
Nan::SetPrototypeMethod(t, "instanceOf", instanceOf);
Nan::SetPrototypeMethod(t, "stop", stop);

Nan::Set(target, Nan::New<v8::String>("Java").ToLocalChecked(), Nan::GetFunction(t).ToLocalChecked());

Expand All @@ -115,6 +117,11 @@ void uvAsyncCb_dynamicProxyJsCall(uv_async_t *handle) {
NAN_METHOD(Java::New) {
Nan::HandleScope scope;

if (!isDefaultLoopRunning) {
uv_async_init(uv_default_loop(), &uvAsync_dynamicProxyJsCall, uvAsyncCb_dynamicProxyJsCall);
isDefaultLoopRunning = true;
}

Java *self = new Java();
self->Wrap(info.This());

Expand Down Expand Up @@ -1239,6 +1246,12 @@ NAN_METHOD(Java::instanceOf) {
info.GetReturnValue().Set(Nan::New<v8::Boolean>(res));
}

NAN_METHOD(Java::stop) {
if (isDefaultLoopRunning) {
uv_close((uv_handle_t *)&uvAsync_dynamicProxyJsCall, NULL);
}
}

template <typename T>
std::string to_string(T value) {
std::ostringstream os;
Expand Down
1 change: 1 addition & 0 deletions src/java.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class Java : public Nan::ObjectWrap {
static NAN_METHOD(getStaticFieldValue);
static NAN_METHOD(setStaticFieldValue);
static NAN_METHOD(instanceOf);
static NAN_METHOD(stop);
static NAN_GETTER(AccessorProhibitsOverwritingGetter);
static NAN_SETTER(AccessorProhibitsOverwritingSetter);
v8::Local<v8::Value> ensureJvm();
Expand Down