jdk-sandbox: comparison test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/setjniftab001.cpp

equal deleted inserted replaced

-:506e9b592f7b
+:1ebe04845112
 #include "agent_common.h"
 #include "JVMTITools.h"
 #include "native_thread.h"
-#ifdef __cplusplus
 extern "C" {
-#endif
-#ifndef JNI_ENV_ARG
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x, y) y
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x, y) x, y
-#define JNI_ENV_PTR(x) (*x)
-#endif
-#endif
-#ifndef JNI_ENV_ARG1
-#ifdef __cplusplus
-#define JNI_ENV_ARG1(x)
-#else
-#define JNI_ENV_ARG1(x) x
-#endif
-#endif
 #define PASSED  0
 #define STATUS_FAILED  2
 #define TRIES 30
 if ((err = jvmti->GetJNIFunctionTable(&orig_jni_functions)) !=
 JVMTI_ERROR_NONE) {
 result = STATUS_FAILED;
 printf("(%s,%d): TEST FAILED: failed to get original JNI function table: %s\n",
 __FILE__, __LINE__, TranslateError(err));
-JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
+env->FatalError("failed to get original JNI function table");
-"failed to get original JNI function table"));
 }
 if ((err = jvmti->GetJNIFunctionTable(&redir_jni_functions)) !=
 JVMTI_ERROR_NONE) {
 result = STATUS_FAILED;
 printf("(%s,%d): TEST FAILED: failed to get redirected JNI function table: %s\n",
 __FILE__, __LINE__, TranslateError(err));
-JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
+env->FatalError("failed to get redirected JNI function table");
-"failed to get redirected JNI function table"));
 }
 if (verbose)
 printf("doRedirect: the JNI function table obtained successfully\n");
 if (verbose)
 if ((err = jvmti->SetJNIFunctionTable(redir_jni_functions)) !=
 JVMTI_ERROR_NONE) {
 result = STATUS_FAILED;
 printf("(%s,%d): TEST FAILED: failed to set new JNI function table: %s\n",
 __FILE__, __LINE__, TranslateError(err));
-JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
+env->FatalError("failed to set new JNI function table");
-"failed to set new JNI function table"));
 }
 if (verbose)
 printf("\ndoRedirect: the functions are overwritten successfully\n");
 }
 if ((err = jvmti->SetJNIFunctionTable(orig_jni_functions)) !=
 JVMTI_ERROR_NONE) {
 result = STATUS_FAILED;
 printf("(%s,%d): TEST FAILED: failed to restore original JNI function table: %s\n",
 __FILE__, __LINE__, TranslateError(err));
-JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
+env->FatalError("failed to restore original JNI function table");
-"failed to restore original JNI function table"));
 }
 if (verbose)
 printf("doRestore: the original JNI function table is restored successfully\n");
 }
 void doExec(JNIEnv *env, int thrNum) {
 jint res;
-if ((res = JNI_ENV_PTR(env)->
+if ((res = env->MonitorEnter(clsObj)) != 0) {
-MonitorEnter(JNI_ENV_ARG(env, clsObj))) != 0) {
 result = STATUS_FAILED;
 printf("(%s,%d): TEST FAILURE: MonitorEnter() returns %d for thread #%d\n",
 __FILE__, __LINE__, res, thrNum);
 }
-if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG1(env))) {
+if (env->ExceptionOccurred()) {
 result = STATUS_FAILED;
 printf("(%s,%d): TEST FAILURE: exception occured for thread #%d\n",
 __FILE__, __LINE__, thrNum);
-JNI_ENV_PTR(env)->ExceptionDescribe(JNI_ENV_ARG1(env));
+env->ExceptionDescribe();
-JNI_ENV_PTR(env)->ExceptionClear(JNI_ENV_ARG1(env));
+env->ExceptionClear();
 }
 if (verbose)
 printf("\ndoExec: thread #%d entered the monitor\n",
 thrNum);
-if ((res = JNI_ENV_PTR(env)->
+if ((res = env->MonitorExit(clsObj)) != 0) {
-MonitorExit(JNI_ENV_ARG(env, clsObj))) != 0) {
 result = STATUS_FAILED;
 printf("(%s,%d): TEST FAILURE: MonitorExit() returns %d for thread #%d\n",
 __FILE__, __LINE__, res, thrNum);
 }
 if (verbose)
 int indx = *((int *) context);
 if (verbose)
 printf("\nwaitingThread: thread #%d started\n\tattaching the thread to the VM ...\n",
 indx);
-if ((res =
+if ((res = vm->AttachCurrentThread((void **) &env, (void *) 0)) != 0) {
-JNI_ENV_PTR(vm)->AttachCurrentThread(
-JNI_ENV_ARG(vm, (void **) &env), (void *) 0)) != 0) {
 printf("(%s,%d): TEST FAILURE: waitingThread: AttachCurrentThread() returns: %d\n",
 __FILE__, __LINE__, res);
 return STATUS_FAILED;
 }
 thrStarted[indx-1] = 1;
 doExec(env, indx);
-if ((res =
+if ((res = vm->DetachCurrentThread()) != 0) {
-JNI_ENV_PTR(vm)->DetachCurrentThread(
-JNI_ENV_ARG1(vm))) != 0) {
 printf("(%s,%d): TEST FAILURE: waitingThread: DetachCurrentThread() returns: %d\n",
 __FILE__, __LINE__, res);
 return STATUS_FAILED;
 }
 if (verbose)
 static jobject getObjectFromField(JNIEnv *env, jobject obj) {
 jfieldID fid;
 jclass _objCls;
-_objCls = JNI_ENV_PTR(env)->GetObjectClass(JNI_ENV_ARG(env, obj));
+_objCls = env->GetObjectClass(obj);
 if (verbose)
 printf("\ngetObjectFromField: obtaining field ID for name=\"%s\" signature=\"%s\"...\n",
 javaField, classSig);
-if ((fid = JNI_ENV_PTR(env)->GetFieldID(
+if ((fid = env->GetFieldID(_objCls, javaField, classSig)) == 0) {
-JNI_ENV_ARG(env, _objCls), javaField, classSig)) == 0) {
 result = STATUS_FAILED;
 printf("(%s,%d): TEST FAILURE: failed to get ID for the field \"%s\"\n",
 __FILE__, __LINE__, javaField);
-JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
+env->FatalError("failed to get ID for the java field");
-"failed to get ID for the java field"));
+}
-}
+return env->GetObjectField(obj, fid);
-return JNI_ENV_PTR(env)->GetObjectField(
-JNI_ENV_ARG(env, obj), fid);
 }
 void startThreads() {
 int i;
 int tries = 0;
 printf("(%s,%d): TEST FAILURE: JVMTI client was not properly loaded\n",
 __FILE__, __LINE__);
 return STATUS_FAILED;
 }
-if ((clsObj = JNI_ENV_PTR(env)->NewGlobalRef(
+if ((clsObj = env->NewGlobalRef(getObjectFromField(env, obj))) == NULL) {
-JNI_ENV_ARG(env, getObjectFromField(env, obj)))) == NULL) {
 printf("(%s,%d): TEST FAILURE: cannot create a new global reference of class \"%s\"\n",
 __FILE__, __LINE__, classSig);
-JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG(env,
+env->FatalError("failed to create a new global reference");
-"failed to create a new global reference"));
 }
 doRedirect(env);
 /* 1: check the assertion inside current thread and new threads */
 Note: the JNI spec says that the main thread can be detached from the VM
 only since JDK 1.2 */
 if (verbose)
 printf("\nb) Checking the assertion inside main thread detached and attached again ...\n\ndetaching the main thread ...\n");
-if ((res =
+if ((res = vm->DetachCurrentThread()) != 0)
-JNI_ENV_PTR(vm)->DetachCurrentThread(
-JNI_ENV_ARG1(vm))) != 0)
 printf("(%s,%d): Warning: DetachCurrentThread() returns: %d\n\
 \tcheck with the detached main thread skipped\n",
 __FILE__, __LINE__, res);
 else {
 if (verbose)
 printf("\nattaching the main thread again ...\n");
-if ((res =
+if ((res = vm->AttachCurrentThread((void **) &nextEnv, (void *) 0)) != 0) {
-JNI_ENV_PTR(vm)->AttachCurrentThread(
-JNI_ENV_ARG(vm, (void **) &nextEnv), (void *) 0)) != 0) {
 printf("(%s,%d): TEST FAILURE: waitingThread: AttachCurrentThread() returns: %d\n",
 __FILE__, __LINE__, res);
 return STATUS_FAILED;
 }
 zeroCounter();
 startThreads();
 waitThreads();
 checkCall(2, 0, "new threads");
-JNI_ENV_PTR(env)->DeleteGlobalRef(JNI_ENV_ARG((nextEnv==NULL)? env:nextEnv, clsObj));
+env->DeleteGlobalRef(clsObj);
 return result;
 }
 #ifdef STATIC_BUILD
 verbose = 1;
 if (verbose)
 printf("verbose mode on\n");
-res = JNI_ENV_PTR(jvm)->
+res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
-GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti), JVMTI_VERSION_1_1);
 if (res != JNI_OK || jvmti == NULL) {
 printf("(%s,%d): Failed to call GetEnv\n", __FILE__, __LINE__);
 return JNI_ERR;
 }
 }
 return JNI_OK;
 }
-#ifdef __cplusplus
+}
-}
-#endif

changeset 51729	1ebe04845112
parent 51551	e409244ce72e
child 51870	cdfabab3413f