Skip to content

Commit 770a78a

Browse files
GoeLinGoeLin
committedNov 21, 2021
8210182: Remove macros for C compilation from vmTestBase but non jvmti
Remove the macros and update the code Backport-of: d0560a2
·
jdk-11.0.27+4jdk-11.0.14-ga
1 parent 63277a4 commit 770a78a

File tree

10 files changed

+203
-423
lines changed

10 files changed

+203
-423
lines changed
 

‎test/hotspot/jtreg/vmTestbase/gc/g1/unloading/libdefine.cpp

+14-32
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,10 @@
3131

3232
#define REFERENCES_ARRAY_SIZE 10000000
3333

34-
#ifndef JNI_ENV_ARG
35-
36-
#ifdef __cplusplus
37-
#define JNI_ENV_ARG(x, y) y
38-
#define JNI_ENV_PTR(x) x
39-
#else
40-
#define JNI_ENV_ARG(x, y) x , y
41-
#define JNI_ENV_PTR(x) (*x)
42-
#endif
43-
44-
#endif
45-
4634
#ifndef _Included_gc_g1_unloading_unloading_classloaders_JNIClassloader
4735
#define _Included_gc_g1_unloading_unloading_classloaders_JNIClassloader
4836

49-
#ifdef __cplusplus
5037
extern "C" {
51-
#endif
5238

5339
/*
5440
* Class: gc_g1_unloading_unloading_classloaders_JNIClassloader
@@ -58,10 +44,10 @@ extern "C" {
5844
JNIEXPORT jclass JNICALL Java_gc_g1_unloading_classloaders_JNIClassloader_loadThroughJNI0 (JNIEnv * env,
5945
jclass clazz, jstring className, jobject classLoader, jbyteArray bytecode) {
6046

61-
const char * classNameChar = JNI_ENV_PTR(env)->GetStringUTFChars(JNI_ENV_ARG(env, className), NULL);
62-
jbyte * arrayContent = JNI_ENV_PTR(env)->GetByteArrayElements(JNI_ENV_ARG(env, bytecode), NULL);
63-
jsize bytecodeLength = JNI_ENV_PTR(env)->GetArrayLength(JNI_ENV_ARG(env, bytecode));
64-
jclass returnValue = JNI_ENV_PTR(env)->DefineClass(JNI_ENV_ARG(env, classNameChar), classLoader, arrayContent, bytecodeLength);
47+
const char * classNameChar = env->GetStringUTFChars(className, NULL);
48+
jbyte * arrayContent = env->GetByteArrayElements(bytecode, NULL);
49+
jsize bytecodeLength = env->GetArrayLength(bytecode);
50+
jclass returnValue = env->DefineClass(classNameChar, classLoader, arrayContent, bytecodeLength);
6551
if (!returnValue) {
6652
printf("ERROR: DefineClass call returned NULL by some reason. Classloading failed.\n");
6753
}
@@ -81,25 +67,25 @@ JNIEXPORT jint JNICALL Java_gc_g1_unloading_loading_ClassLoadingThread_makeRede
8167
jvmtiError err;
8268
jvmtiCapabilities caps;
8369
jvmtiClassDefinition classDef;
84-
jint jint_err = JNI_ENV_PTR(env)->GetJavaVM(JNI_ENV_ARG(env, &jvm));
70+
jint jint_err = env->GetJavaVM(&jvm);
8571
if (jint_err) {
8672
printf("GetJavaVM returned nonzero: %d", jint_err);
8773
return STATUS_FAILED;
8874
}
8975

90-
jint_err = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **)&jvmti), JVMTI_VERSION_1_0);
76+
jint_err = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_0);
9177
if (jint_err) {
9278
printf("GetEnv returned nonzero: %d", jint_err);
9379
return STATUS_FAILED;
9480
}
9581

96-
err = JNI_ENV_PTR(jvmti)->GetPotentialCapabilities(JNI_ENV_ARG(jvmti, &caps));
82+
err = jvmti->GetPotentialCapabilities(&caps);
9783
if (err != JVMTI_ERROR_NONE) {
9884
printf("(GetPotentialCapabilities) unexpected error: %d\n",err);
9985
return JNI_ERR;
10086
}
10187

102-
err = JNI_ENV_PTR(jvmti)->AddCapabilities(JNI_ENV_ARG(jvmti, &caps));
88+
err = jvmti->AddCapabilities(&caps);
10389
if (err != JVMTI_ERROR_NONE) {
10490
printf("(AddCapabilities) unexpected error: %d\n", err);
10591
return JNI_ERR;
@@ -112,16 +98,16 @@ JNIEXPORT jint JNICALL Java_gc_g1_unloading_loading_ClassLoadingThread_makeRede
11298

11399
classDef.klass = redefCls;
114100
classDef.class_byte_count =
115-
JNI_ENV_PTR(env)->GetArrayLength(JNI_ENV_ARG(env, classBytes));
101+
env->GetArrayLength(classBytes);
116102
classDef.class_bytes = (unsigned char *)
117-
JNI_ENV_PTR(env)->GetByteArrayElements(JNI_ENV_ARG(env, classBytes),
103+
env->GetByteArrayElements(classBytes,
118104
NULL);
119105

120106
if (fl == 2) {
121107
printf(">>>>>>>> Invoke RedefineClasses():\n");
122108
printf("\tnew class byte count=%d\n", classDef.class_byte_count);
123109
}
124-
err = JNI_ENV_PTR(jvmti)->RedefineClasses(JNI_ENV_ARG(jvmti, 1), &classDef);
110+
err = jvmti->RedefineClasses(1, &classDef);
125111
if (err != JVMTI_ERROR_NONE) {
126112
printf("%s: Failed to call RedefineClasses():\n", __FILE__);
127113
printf("\tthe function returned error %d\n", err);
@@ -145,7 +131,7 @@ int firstFreeIndex = 0;
145131
JNIEXPORT jint JNICALL Java_gc_g1_unloading_keepref_JNIGlobalRefHolder_keepGlobalJNIReference
146132
(JNIEnv * env, jclass clazz, jobject obj) {
147133
int returnValue;
148-
referencesArray[firstFreeIndex] = JNI_ENV_PTR(env)->NewGlobalRef(JNI_ENV_ARG(env, obj));
134+
referencesArray[firstFreeIndex] = env->NewGlobalRef(obj);
149135
printf("checkpoint1 %d \n", firstFreeIndex);
150136
returnValue = firstFreeIndex;
151137
firstFreeIndex++;
@@ -159,7 +145,7 @@ JNIEXPORT jint JNICALL Java_gc_g1_unloading_keepref_JNIGlobalRefHolder_keepGloba
159145
*/
160146
JNIEXPORT void JNICALL Java_gc_g1_unloading_keepref_JNIGlobalRefHolder_deleteGlobalJNIReference
161147
(JNIEnv * env, jclass clazz, jint index) {
162-
JNI_ENV_PTR(env)->DeleteGlobalRef(JNI_ENV_ARG(env, referencesArray[index]));
148+
env->DeleteGlobalRef(referencesArray[index]);
163149
}
164150

165151

@@ -185,10 +171,6 @@ JNIEXPORT void JNICALL Java_gc_g1_unloading_keepref_JNILocalRefHolder_holdWithJN
185171
waitMethod = env->GetMethodID(objectClazz, "wait", "()V");
186172
env->CallVoidMethod(syncObject, waitMethod);
187173
printf("checkpoint2 \n");
188-
}
189-
190-
191-
#ifdef __cplusplus
192174
}
193-
#endif
175+
}
194176
#endif

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/libforceEarlyReturn004a.cpp

+3-22
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,8 @@
2323

2424
#include "jni.h"
2525

26-
#ifdef __cplusplus
2726
extern "C" {
28-
#endif
2927

30-
#ifndef JNI_ENV_PTR
31-
32-
#ifdef __cplusplus
33-
#define JNI_ENV_ARG_2(x, y) y
34-
#define JNI_ENV_ARG_3(x, y, z) y, z
35-
#define JNI_ENV_ARG_4(x, y, z, a) y, z, a
36-
#define JNI_ENV_PTR(x) x
37-
#else
38-
#define JNI_ENV_ARG_2(x,y) x, y
39-
#define JNI_ENV_ARG_3(x, y, z) x, y, z
40-
#define JNI_ENV_ARG_4(x, y, z, a) x, y, z, a
41-
#define JNI_ENV_PTR(x) (*x)
42-
#endif
43-
44-
#endif
4528

4629
int always_true = 1;
4730

@@ -50,9 +33,9 @@ Java_nsk_jdi_ThreadReference_forceEarlyReturn_forceEarlyReturn004_forceEarlyRetu
5033
{
5134
int dummy_counter = 0;
5235
// notify another thread that thread in native method
53-
jclass klass = JNI_ENV_PTR(env)->GetObjectClass(JNI_ENV_ARG_2(env, object));
54-
jfieldID field = JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG_4(env, klass, "threadInNative", "Z"));
55-
JNI_ENV_PTR(env)->SetBooleanField(JNI_ENV_ARG_4(env, object, field, 1));
36+
jclass klass = env->GetObjectClass(object);
37+
jfieldID field = env->GetFieldID(klass, "threadInNative", "Z");
38+
env->SetBooleanField(object, field, 1);
5639

5740
// execute infinite loop to be sure that thread in native method
5841
while(always_true)
@@ -66,6 +49,4 @@ Java_nsk_jdi_ThreadReference_forceEarlyReturn_forceEarlyReturn004_forceEarlyRetu
6649
return dummy_counter >= 0 ? 0 : 1;
6750
}
6851

69-
#ifdef __cplusplus
7052
}
71-
#endif

‎test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn005/libforceEarlyReturn005a.cpp

+4-19
Original file line numberDiff line numberDiff line change
@@ -24,37 +24,22 @@
2424
#include "jni.h"
2525
#include "nsk_tools.cpp"
2626

27-
#ifdef __cplusplus
2827
extern "C" {
29-
#endif
3028

31-
#ifndef JNI_ENV_PTR
32-
33-
#ifdef __cplusplus
34-
#define JNI_ENV_ARG_2(x, y) y
35-
#define JNI_ENV_ARG_3(x,y,z) y, z
36-
#define JNI_ENV_PTR(x) x
37-
#else
38-
#define JNI_ENV_ARG_2(x,y) x, y
39-
#define JNI_ENV_ARG_3(x,y,z) x, y, z
40-
#define JNI_ENV_PTR(x) (*x)
41-
#endif
42-
43-
#endif
4429

4530
JNIEXPORT void JNICALL
4631
Java_nsk_jdi_ThreadReference_forceEarlyReturn_forceEarlyReturn005_forceEarlyReturn005a_nativeJNIMonitorEnter(JNIEnv *env, jobject classObject, jobject object)
4732
{
48-
jint success = JNI_ENV_PTR(env)->MonitorEnter(JNI_ENV_ARG_2(env, object));
33+
jint success = env->MonitorEnter(object);
4934

5035
if(success != 0)
5136
{
5237
NSK_COMPLAIN1("MonitorEnter return non-zero: %d\n", success);
5338

54-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestJNIError")), "MonitorEnter return non-zero"));
39+
env->ThrowNew(
40+
env->FindClass("nsk/share/TestJNIError"),
41+
"MonitorEnter return non-zero");
5542
}
5643
}
5744

58-
#ifdef __cplusplus
5945
}
60-
#endif

‎test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/libforceEarlyReturn002a.cpp

+3-22
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,8 @@
2323

2424
#include "jni.h"
2525

26-
#ifdef __cplusplus
2726
extern "C" {
28-
#endif
2927

30-
#ifndef JNI_ENV_PTR
31-
32-
#ifdef __cplusplus
33-
#define JNI_ENV_ARG_2(x, y) y
34-
#define JNI_ENV_ARG_3(x, y, z) y, z
35-
#define JNI_ENV_ARG_4(x, y, z, a) y, z, a
36-
#define JNI_ENV_PTR(x) x
37-
#else
38-
#define JNI_ENV_ARG_2(x,y) x, y
39-
#define JNI_ENV_ARG_3(x, y, z) x, y, z
40-
#define JNI_ENV_ARG_4(x, y, z, a) x, y, z, a
41-
#define JNI_ENV_PTR(x) (*x)
42-
#endif
43-
44-
#endif
4528

4629
int always_true = 1;
4730

@@ -50,9 +33,9 @@ Java_nsk_jdwp_ThreadReference_ForceEarlyReturn_forceEarlyReturn002_forceEarlyRet
5033
{
5134
int dummy_counter = 0;
5235
// notify another thread that thread in native method
53-
jclass klass = JNI_ENV_PTR(env)->GetObjectClass(JNI_ENV_ARG_2(env, object));
54-
jfieldID field = JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG_4(env, klass, "threadInNative", "Z"));
55-
JNI_ENV_PTR(env)->SetBooleanField(JNI_ENV_ARG_4(env, object, field, 1));
36+
jclass klass = env->GetObjectClass(object);
37+
jfieldID field = env->GetFieldID(klass, "threadInNative", "Z");
38+
env->SetBooleanField(object, field, 1);
5639

5740
// execute infinite loop to be sure that thread in native method
5841
while(always_true)
@@ -66,6 +49,4 @@ Java_nsk_jdwp_ThreadReference_ForceEarlyReturn_forceEarlyReturn002_forceEarlyRet
6649
return dummy_counter >= 0 ? 0 : 1;
6750
}
6851

69-
#ifdef __cplusplus
7052
}
71-
#endif

‎test/hotspot/jtreg/vmTestbase/nsk/share/jdi/MonitorEnterExecutor.cpp

+24-29
Original file line numberDiff line numberDiff line change
@@ -23,45 +23,34 @@
2323
#include "jni.h"
2424
#include "nsk_tools.h"
2525

26-
#ifdef __cplusplus
2726
extern "C" {
28-
#endif
2927

30-
#ifndef JNI_ENV_PTR
31-
32-
#ifdef __cplusplus
33-
#define JNI_ENV_ARG_2(x, y) y
34-
#define JNI_ENV_ARG_3(x,y, z) y, z
35-
#define JNI_ENV_PTR(x) x
36-
#else
37-
#define JNI_ENV_ARG_2(x,y) x, y
38-
#define JNI_ENV_ARG_3(x,y, z) x, y, z
39-
#define JNI_ENV_PTR(x) (*x)
40-
#endif
41-
42-
#endif
4328

4429
JNIEXPORT void JNICALL
4530
Java_nsk_share_jdi_MonitorEnterExecutor_nativeJNIMonitorEnter(JNIEnv *env, jobject thisObject)
4631
{
4732
jint success;
4833

49-
success = JNI_ENV_PTR(env)->MonitorEnter(JNI_ENV_ARG_2(env, thisObject));
34+
success = env->MonitorEnter(thisObject);
5035

5136
if(success != 0)
5237
{
5338
NSK_COMPLAIN1("MonitorEnter return non-zero: %d\n", success);
5439

55-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestJNIError")), "MonitorEnter return non-zero"));
40+
env->ThrowNew(
41+
env->FindClass("nsk/share/TestJNIError"),
42+
"MonitorEnter return non-zero");
5643
}
5744

58-
success = JNI_ENV_PTR(env)->MonitorExit(JNI_ENV_ARG_2(env, thisObject));
45+
success = env->MonitorExit(thisObject);
5946

6047
if(success != 0)
6148
{
6249
NSK_COMPLAIN1("MonitorExit return non-zero: %d\n", success);
6350

64-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestJNIError")), "MonitorExit return non-zero"));
51+
env->ThrowNew(
52+
env->FindClass("nsk/share/TestJNIError"),
53+
"MonitorExit return non-zero");
6554
}
6655
}
6756

@@ -70,22 +59,26 @@ Java_nsk_share_jdi_MonitorEnterExecutor_11Subclass_nativeJNIMonitorEnter(JNIEnv
7059
{
7160
jint success;
7261

73-
success = JNI_ENV_PTR(env)->MonitorEnter(JNI_ENV_ARG_2(env, thisObject));
62+
success = env->MonitorEnter(thisObject);
7463

7564
if(success != 0)
7665
{
7766
NSK_COMPLAIN1("MonitorEnter return non-zero: %d\n", success);
7867

79-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestJNIError")), "MonitorEnter return non-zero"));
68+
env->ThrowNew(
69+
env->FindClass("nsk/share/TestJNIError"),
70+
"MonitorEnter return non-zero");
8071
}
8172

82-
success = JNI_ENV_PTR(env)->MonitorExit(JNI_ENV_ARG_2(env, thisObject));
73+
success = env->MonitorExit(thisObject);
8374

8475
if(success != 0)
8576
{
8677
NSK_COMPLAIN1("MonitorExit return non-zero: %d\n", success);
8778

88-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestJNIError")), "MonitorExit return non-zero"));
79+
env->ThrowNew(
80+
env->FindClass("nsk/share/TestJNIError"),
81+
"MonitorExit return non-zero");
8982
}
9083
}
9184

@@ -94,25 +87,27 @@ Java_nsk_share_jdi_MonitorEnterExecutor_12Subclass_nativeJNIMonitorEnter(JNIEnv
9487
{
9588
jint success;
9689

97-
success = JNI_ENV_PTR(env)->MonitorEnter(JNI_ENV_ARG_2(env, thisObject));
90+
success = env->MonitorEnter(thisObject);
9891

9992
if(success != 0)
10093
{
10194
NSK_COMPLAIN1("MonitorEnter return non-zero: %d\n", success);
10295

103-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestJNIError")), "MonitorEnter return non-zero"));
96+
env->ThrowNew(
97+
env->FindClass("nsk/share/TestJNIError"),
98+
"MonitorEnter return non-zero");
10499
}
105100

106-
success = JNI_ENV_PTR(env)->MonitorExit(JNI_ENV_ARG_2(env, thisObject));
101+
success = env->MonitorExit(thisObject);
107102

108103
if(success != 0)
109104
{
110105
NSK_COMPLAIN1("MonitorExit return non-zero: %d\n", success);
111106

112-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestJNIError")), "MonitorExit return non-zero"));
107+
env->ThrowNew(
108+
env->FindClass("nsk/share/TestJNIError"),
109+
"MonitorExit return non-zero");
113110
}
114111
}
115112

116-
#ifdef __cplusplus
117113
}
118-
#endif

‎test/hotspot/jtreg/vmTestbase/nsk/share/jni/JNIreferences.cpp

+29-34
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,8 @@
2424
#include <stdlib.h>
2525
#include "nsk_tools.h"
2626

27-
#ifdef __cplusplus
2827
extern "C" {
29-
#endif
3028

31-
#ifndef JNI_ENV_PTR
32-
33-
#ifdef __cplusplus
34-
#define JNI_ENV_ARG_2(x, y) y
35-
#define JNI_ENV_ARG_3(x, y, z) y, z
36-
#define JNI_ENV_ARG_4(x, y, z, a) y, z, a
37-
#define JNI_ENV_PTR(x) x
38-
#else
39-
#define JNI_ENV_ARG_2(x,y) x, y
40-
#define JNI_ENV_ARG_3(x, y, z) x, y, z
41-
#define JNI_ENV_ARG_4(x, y, z, a) x, y, z, a
42-
#define JNI_ENV_PTR(x) (*x)
43-
#endif
44-
45-
#endif
4629

4730
static jobject* globalReferences = NULL;
4831
static jweak* weakReferences = NULL;
@@ -76,13 +59,15 @@ Java_nsk_share_ReferringObject_createJNIGlobalReferenceNative(JNIEnv *env,
7659

7760
if(reference == NULL)
7861
{
79-
reference = JNI_ENV_PTR(env)->NewGlobalRef(JNI_ENV_ARG_2(env, object));
62+
reference = env->NewGlobalRef(object);
8063

8164
if(reference == NULL)
8265
{
8366
NSK_COMPLAIN0("NewGlobalRef return NULL\n");
8467

85-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestJNIError")), "NewGlobalRef return NULL"));
68+
env->ThrowNew(
69+
env->FindClass("nsk/share/TestJNIError"),
70+
"NewGlobalRef return NULL");
8671
}
8772

8873
globalReferences[i] = reference;
@@ -106,10 +91,12 @@ Java_nsk_share_ReferringObject_deleteJNIGlobalReferenceNative(JNIEnv *env,
10691
{
10792
NSK_COMPLAIN1("globalReferences[%d] = NULL, possible wrong index is passed\n", index);
10893

109-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestBug")), "Requested globalReferences[] element is NULL, possible wrong index is passed"));
94+
env->ThrowNew(
95+
env->FindClass("nsk/share/TestBug"),
96+
"Requested globalReferences[] element is NULL, possible wrong index is passed");
11097
}
11198

112-
JNI_ENV_PTR(env)->DeleteGlobalRef(JNI_ENV_ARG_2(env, reference));
99+
env->DeleteGlobalRef(reference);
113100

114101
globalReferences[index] = NULL;
115102
}
@@ -119,23 +106,27 @@ JNIEXPORT void JNICALL
119106
Java_nsk_share_ReferringObject_createJNILocalReferenceNative(JNIEnv *env,
120107
jobject thisObject, jobject object, jobject createWicket, jobject deleteWicket)
121108
{
122-
jobject reference = JNI_ENV_PTR(env)->NewLocalRef(JNI_ENV_ARG_2(env, object));
109+
jobject reference = env->NewLocalRef(object);
123110
jclass klass;
124111

125112
if(reference == NULL)
126113
{
127114
NSK_COMPLAIN0("NewLocalRef return NULL\n");
128115

129-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestJNIError")), "NewLocalRef return NULL"));
116+
env->ThrowNew(
117+
env->FindClass("nsk/share/TestJNIError"),
118+
"NewLocalRef return NULL");
130119
}
131120

132-
klass = JNI_ENV_PTR(env)->GetObjectClass(JNI_ENV_ARG_2(env, createWicket));
121+
klass = env->GetObjectClass(createWicket);
133122

134123
// notify another thread that JNI local reference has been created
135-
JNI_ENV_PTR(env)->CallVoidMethod(JNI_ENV_ARG_3(env, createWicket, JNI_ENV_PTR(env)->GetMethodID(JNI_ENV_ARG_4(env, klass, "unlock", "()V"))));
124+
env->CallVoidMethod(createWicket,
125+
env->GetMethodID(klass, "unlock", "()V"));
136126

137127
// wait till JNI local reference can be released (it will heppen then we will leave the method)
138-
JNI_ENV_PTR(env)->CallVoidMethod(JNI_ENV_ARG_3(env, deleteWicket, JNI_ENV_PTR(env)->GetMethodID(JNI_ENV_ARG_4(env, klass, "waitFor", "()V"))));
128+
env->CallVoidMethod(deleteWicket,
129+
env->GetMethodID(klass, "waitFor", "()V"));
139130
}
140131

141132
JNIEXPORT jint JNICALL
@@ -168,13 +159,15 @@ Java_nsk_share_ReferringObject_createJNIWeakReferenceNative(JNIEnv *env,
168159

169160
if(reference == NULL)
170161
{
171-
reference = JNI_ENV_PTR(env)->NewWeakGlobalRef(JNI_ENV_ARG_2(env, object));
162+
reference = env->NewWeakGlobalRef(object);
172163

173164
if(reference == NULL)
174165
{
175166
NSK_COMPLAIN0("NewWeakGlobalRef return NULL\n");
176167

177-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestJNIError")), "NewWeakGlobalRef return NULL"));
168+
env->ThrowNew(
169+
env->FindClass("nsk/share/TestJNIError"),
170+
"NewWeakGlobalRef return NULL");
178171
}
179172

180173
weakReferences[i] = reference;
@@ -198,21 +191,23 @@ Java_nsk_share_ReferringObject_deleteJNIWeakReferenceNative(JNIEnv *env,
198191
{
199192
NSK_COMPLAIN1("weakReferences[%d] = NULL, possible wrong index is passed\n", index);
200193

201-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestBug")), "Requested weakReferences[] element is NULL, possible wrong index is passed"));
194+
env->ThrowNew(
195+
env->FindClass("nsk/share/TestBug"),
196+
"Requested weakReferences[] element is NULL, possible wrong index is passed");
202197
}
203198

204-
if(JNI_ENV_PTR(env)->IsSameObject(JNI_ENV_ARG_3(env, reference, NULL)) == JNI_TRUE)
199+
if(env->IsSameObject(reference, NULL) == JNI_TRUE)
205200
{
206201
NSK_COMPLAIN0("TEST BUG: Weak reference was collected\n");
207202

208-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestBug")), "TEST BUG: Weak reference was collected"));
203+
env->ThrowNew(
204+
env->FindClass("nsk/share/TestBug"),
205+
"TEST BUG: Weak reference was collected");
209206
}
210207

211-
JNI_ENV_PTR(env)->DeleteWeakGlobalRef(JNI_ENV_ARG_2(env, reference));
208+
env->DeleteWeakGlobalRef(reference);
212209

213210
weakReferences[index] = NULL;
214211
}
215212

216-
#ifdef __cplusplus
217213
}
218-
#endif

‎test/hotspot/jtreg/vmTestbase/nsk/share/jpda/libNativeMethodsTestThread.cpp

+88-187
Large diffs are not rendered by default.

‎test/hotspot/jtreg/vmTestbase/nsk/share/locks/JNIMonitorLocker.cpp

+27-38
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,8 @@
2323
#include "jni.h"
2424
#include "nsk_tools.h"
2525

26-
#ifdef __cplusplus
2726
extern "C" {
28-
#endif
2927

30-
#ifndef JNI_ENV_PTR
31-
32-
#ifdef __cplusplus
33-
#define JNI_ENV_ARG_2(x, y) y
34-
#define JNI_ENV_ARG_3(x, y, z) y, z
35-
#define JNI_ENV_ARG_4(x, y, z, a) y, z, a
36-
#define JNI_ENV_PTR(x) x
37-
#else
38-
#define JNI_ENV_ARG_2(x,y) x, y
39-
#define JNI_ENV_ARG_3(x, y, z) x, y, z
40-
#define JNI_ENV_ARG_4(x, y, z, a) x, y, z, a
41-
#define JNI_ENV_PTR(x) (*x)
42-
#endif
43-
44-
#endif
4528

4629
JNIEXPORT void JNICALL
4730
Java_nsk_share_locks_JNIMonitorLocker_doLock(JNIEnv *env, jobject thisObject)
@@ -74,54 +57,60 @@ This method executes JNI analog for following Java code:
7457
// class for field 'inner'
7558
jclass deadlockLockerClass;
7659

77-
success = JNI_ENV_PTR(env)->MonitorEnter(JNI_ENV_ARG_2(env, thisObject));
60+
success = env->MonitorEnter(thisObject);
7861

7962
if(success != 0)
8063
{
8164
NSK_COMPLAIN1("MonitorEnter return non-zero: %d\n", success);
8265

83-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestJNIError")), "MonitorEnter return non-zero"));
66+
env->ThrowNew(
67+
env->FindClass("nsk/share/TestJNIError"),
68+
"MonitorEnter return non-zero");
8469
}
8570

86-
thisObjectClass = JNI_ENV_PTR(env)->GetObjectClass(JNI_ENV_ARG_2(env, thisObject));
71+
thisObjectClass = env->GetObjectClass(thisObject);
8772

8873
// step1.unlockAll()
89-
field = JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG_4(env, thisObjectClass, "step1", "Lnsk/share/Wicket;"));
74+
field = env->GetFieldID(thisObjectClass, "step1", "Lnsk/share/Wicket;");
9075

91-
wicketObject = JNI_ENV_PTR(env)->GetObjectField(JNI_ENV_ARG_3(env, thisObject, field));
92-
wicketClass = JNI_ENV_PTR(env)->GetObjectClass(JNI_ENV_ARG_2(env, wicketObject));
76+
wicketObject = env->GetObjectField(thisObject, field);
77+
wicketClass = env->GetObjectClass(wicketObject);
9378

94-
JNI_ENV_PTR(env)->CallVoidMethod(JNI_ENV_ARG_3(env, wicketObject, JNI_ENV_PTR(env)->GetMethodID(JNI_ENV_ARG_4(env, wicketClass, "unlockAll", "()V"))));
79+
env->CallVoidMethod(wicketObject,
80+
env->GetMethodID(wicketClass, "unlockAll", "()V"));
9581

9682
// step2.waitFor()
97-
field = JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG_4(env, thisObjectClass, "step2", "Lnsk/share/Wicket;"));
98-
wicketObject = JNI_ENV_PTR(env)->GetObjectField(JNI_ENV_ARG_3(env, thisObject, field));
83+
field = env->GetFieldID(thisObjectClass, "step2", "Lnsk/share/Wicket;");
84+
wicketObject = env->GetObjectField(thisObject, field);
9985

100-
JNI_ENV_PTR(env)->CallVoidMethod(JNI_ENV_ARG_3(env, wicketObject, JNI_ENV_PTR(env)->GetMethodID(JNI_ENV_ARG_4(env, wicketClass, "waitFor", "()V"))));
86+
env->CallVoidMethod(wicketObject,
87+
env->GetMethodID(wicketClass, "waitFor", "()V"));
10188

10289
// readyWicket.unlock()
103-
field = JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG_4(env, thisObjectClass, "readyWicket", "Lnsk/share/Wicket;"));
104-
wicketObject = JNI_ENV_PTR(env)->GetObjectField(JNI_ENV_ARG_3(env, thisObject, field));
90+
field = env->GetFieldID(thisObjectClass, "readyWicket", "Lnsk/share/Wicket;");
91+
wicketObject = env->GetObjectField(thisObject, field);
10592

106-
JNI_ENV_PTR(env)->CallVoidMethod(JNI_ENV_ARG_3(env, wicketObject, JNI_ENV_PTR(env)->GetMethodID(JNI_ENV_ARG_4(env, wicketClass, "unlock", "()V"))));
93+
env->CallVoidMethod(wicketObject,
94+
env->GetMethodID(wicketClass, "unlock", "()V"));
10795

10896
// inner.lock()
109-
field = JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG_4(env, thisObjectClass, "inner", "Lnsk/share/locks/DeadlockLocker;"));
110-
innerObject = JNI_ENV_PTR(env)->GetObjectField(JNI_ENV_ARG_3(env, thisObject, field));
111-
deadlockLockerClass = JNI_ENV_PTR(env)->GetObjectClass(JNI_ENV_ARG_2(env, innerObject));
97+
field = env->GetFieldID(thisObjectClass, "inner", "Lnsk/share/locks/DeadlockLocker;");
98+
innerObject = env->GetObjectField(thisObject, field);
99+
deadlockLockerClass = env->GetObjectClass(innerObject);
112100

113-
JNI_ENV_PTR(env)->CallVoidMethod(JNI_ENV_ARG_3(env, innerObject, JNI_ENV_PTR(env)->GetMethodID(JNI_ENV_ARG_4(env, deadlockLockerClass, "lock", "()V"))));
101+
env->CallVoidMethod(innerObject,
102+
env->GetMethodID(deadlockLockerClass, "lock", "()V"));
114103

115-
success = JNI_ENV_PTR(env)->MonitorExit(JNI_ENV_ARG_2(env, thisObject));
104+
success = env->MonitorExit(thisObject);
116105

117106
if(success != 0)
118107
{
119108
NSK_COMPLAIN1("MonitorExit return non-zero: %d\n", success);
120109

121-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestJNIError")), "MonitorExit return non-zero"));
110+
env->ThrowNew(
111+
env->FindClass("nsk/share/TestJNIError"),
112+
"MonitorExit return non-zero");
122113
}
123114
}
124115

125-
#ifdef __cplusplus
126116
}
127-
#endif

‎test/hotspot/jtreg/vmTestbase/nsk/share/locks/LockingThread.cpp

+11-25
Original file line numberDiff line numberDiff line change
@@ -23,55 +23,41 @@
2323
#include "jni.h"
2424
#include "nsk_tools.h"
2525

26-
#ifdef __cplusplus
2726
extern "C" {
28-
#endif
2927

30-
#ifndef JNI_ENV_PTR
31-
32-
#ifdef __cplusplus
33-
#define JNI_ENV_ARG_2(x, y) y
34-
#define JNI_ENV_ARG_3(x, y, z) y, z
35-
#define JNI_ENV_ARG_4(x, y, z, a) y, z, a
36-
#define JNI_ENV_PTR(x) x
37-
#else
38-
#define JNI_ENV_ARG_2(x,y) x, y
39-
#define JNI_ENV_ARG_3(x, y, z) x, y, z
40-
#define JNI_ENV_ARG_4(x, y, z, a) x, y, z, a
41-
#define JNI_ENV_PTR(x) (*x)
42-
#endif
43-
44-
#endif
4528

4629
JNIEXPORT void JNICALL
4730
Java_nsk_share_locks_LockingThread_nativeJNIMonitorEnter(JNIEnv *env, jobject thisObject, jobject object)
4831
{
4932
jint success;
5033
jclass klass;
5134

52-
success = JNI_ENV_PTR(env)->MonitorEnter(JNI_ENV_ARG_2(env, object));
35+
success = env->MonitorEnter(object);
5336

5437
if(success != 0)
5538
{
5639
NSK_COMPLAIN1("MonitorEnter return non-zero: %d\n", success);
5740

58-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestJNIError")), "MonitorEnter return non-zero"));
41+
env->ThrowNew(
42+
env->FindClass("nsk/share/TestJNIError"),
43+
"MonitorEnter return non-zero");
5944
}
6045

61-
klass = JNI_ENV_PTR(env)->GetObjectClass(JNI_ENV_ARG_2(env, thisObject));
46+
klass = env->GetObjectClass(thisObject);
6247

63-
JNI_ENV_PTR(env)->CallVoidMethod(JNI_ENV_ARG_3(env, thisObject, JNI_ENV_PTR(env)->GetMethodID(JNI_ENV_ARG_4(env, klass, "createStackFrame", "()V"))));
48+
env->CallVoidMethod(thisObject,
49+
env->GetMethodID(klass, "createStackFrame", "()V"));
6450

65-
success = JNI_ENV_PTR(env)->MonitorExit(JNI_ENV_ARG_2(env, object));
51+
success = env->MonitorExit(object);
6652

6753
if(success != 0)
6854
{
6955
NSK_COMPLAIN1("MonitorExit return non-zero: %d\n", success);
7056

71-
JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG_3(env, JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG_2(env, "nsk/share/TestJNIError")), "MonitorExit return non-zero"));
57+
env->ThrowNew(
58+
env->FindClass("nsk/share/TestJNIError"),
59+
"MonitorExit return non-zero");
7260
}
7361
}
7462

75-
#ifdef __cplusplus
7663
}
77-
#endif

‎test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/redefineClasses.cpp

-15
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,8 @@
3030
#include "JVMTITools.h"
3131
#include "jvmti_tools.h"
3232

33-
#ifdef __cplusplus
3433
extern "C" {
35-
#endif
3634

37-
#ifndef JNI_ENV_ARG
38-
39-
#ifdef __cplusplus
40-
#define JNI_ENV_ARG(x, y) y
41-
#define JNI_ENV_PTR(x) x
42-
#else
43-
#define JNI_ENV_ARG(x,y) x, y
44-
#define JNI_ENV_PTR(x) (*x)
45-
#endif
46-
47-
#endif
4835

4936
static jvmtiEnv *test_jvmti = NULL;
5037
static jvmtiCapabilities caps;
@@ -126,6 +113,4 @@ JNIEXPORT jint JNICALL Agent_OnAttach(JavaVM *jvm, char *options, void *reserved
126113
return Agent_Initialize(jvm, options, reserved);
127114
}
128115

129-
#ifdef __cplusplus
130116
}
131-
#endif

1 commit comments

Comments
 (1)

openjdk-notifier[bot] commented on Nov 21, 2021

@openjdk-notifier[bot]
openjdk-notifier[bot]
on Nov 21, 2021

Review

Issues

Please sign in to comment.