Skip to content

z/OS xlc++ support changes #404

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
joeferner merged 2 commits into from
Aug 4, 2017
Merged

z/OS xlc++ support changes #404

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad44644
initial z/OS xlc++ support changes
Aug 3, 2017
c8e65ba
Cleaned up implementation
Aug 4, 2017
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
25 changes: 20 additions & 5 deletions src/java.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@

#define DYNAMIC_PROXY_JS_ERROR -4

long v8ThreadId;
#ifdef WIN32
typedef long threadId;
#else
typedef pthread_t threadId;
#endif

threadId v8ThreadId;

/*static*/ Nan::Persistent<v8::FunctionTemplate> Java::s_ct;
/*static*/ std::string Java::s_nativeBindingLocation;
Expand All @@ -27,11 +33,19 @@ void my_sleep(int dur) {
#endif
}

long my_getThreadId() {
threadId my_getThreadId() {
#ifdef WIN32
return (long)GetCurrentThreadId();
#else
return (long)pthread_self();
return pthread_self();
#endif
}

bool v8ThreadIdEquals(threadId a, threadId b) {
#ifdef WIN32
return a == b;
#else
return pthread_equal(a, b);
#endif
}

Expand Down Expand Up @@ -1297,7 +1311,8 @@ void throwNewThrowable(JNIEnv* env, const char * excClassName, std::string msg)
}

JNIEXPORT jobject JNICALL Java_node_NodeDynamicProxyClass_callJs(JNIEnv *env, jobject src, jlong ptr, jobject method, jobjectArray args) {
long myThreadId = my_getThreadId();
threadId myThreadId = my_getThreadId();

bool hasArgsGlobalRef = false;

// args needs to be global, you can't send env across thread boundaries
Expand All @@ -1315,7 +1330,7 @@ JNIEXPORT jobject JNICALL Java_node_NodeDynamicProxyClass_callJs(JNIEnv *env, jo

uv_work_t* req = new uv_work_t();
req->data = dynamicProxyData;
if(myThreadId == v8ThreadId) {
if(v8ThreadIdEquals(myThreadId, v8ThreadId)) {
#if NODE_MINOR_VERSION >= 10
EIO_AfterCallJs(req, 0);
#else
Expand Down