Skip to content

Commit 91c6420

Browse files
GoeLinGoeLin
committed
8211131: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/[G-I]*
Remove the NSK_CPP_STUB macros Backport-of: 85c6642
1 parent 0b8e1b1 commit 91c6420

File tree

50 files changed

+393
-668
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+393
-668
lines changed

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAvailableProcessors/getavailproc001/getavailproc001.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ static int checkProcessors(jvmtiEnv* jvmti, const char where[]) {
5353
jint processors = 0;
5454

5555
NSK_DISPLAY0("GetAvailableProcessors() for current JVMTI env\n");
56-
if (!NSK_JVMTI_VERIFY(
57-
NSK_CPP_STUB2(GetAvailableProcessors, jvmti, &processors))) {
56+
if (!NSK_JVMTI_VERIFY(jvmti->GetAvailableProcessors(&processors))) {
5857
return NSK_FALSE;
5958
}
6059
NSK_DISPLAY1(" ... got processors: %d\n", (int)processors);
@@ -157,9 +156,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
157156
memset(&eventCallbacks, 0, sizeof(eventCallbacks));
158157
eventCallbacks.VMInit = callbackVMInit;
159158
eventCallbacks.VMDeath = callbackVMDeath;
160-
if (!NSK_JVMTI_VERIFY(
161-
NSK_CPP_STUB3(SetEventCallbacks, jvmti,
162-
&eventCallbacks, sizeof(eventCallbacks)))) {
159+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
163160
return JNI_ERR;
164161
}
165162

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps002/getcaps002.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, const char where[]) {
190190
memset(&caps, 0, sizeof(jvmtiCapabilities));
191191

192192
NSK_DISPLAY0("GetCapabilities() for current JVMTI env\n");
193-
if (!NSK_JVMTI_VERIFY(
194-
NSK_CPP_STUB2(GetCapabilities, jvmti, &caps))) {
193+
if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) {
195194
return NSK_FALSE;
196195
}
197196

@@ -297,9 +296,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
297296
memset(&eventCallbacks, 0, sizeof(eventCallbacks));
298297
eventCallbacks.VMInit = callbackVMInit;
299298
eventCallbacks.VMDeath = callbackVMDeath;
300-
if (!NSK_JVMTI_VERIFY(
301-
NSK_CPP_STUB3(SetEventCallbacks, jvmti,
302-
&eventCallbacks, sizeof(eventCallbacks)))) {
299+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
303300
return JNI_ERR;
304301
}
305302

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss002/clsldrclss002.cpp‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,15 @@ static int prepare(JNIEnv* jni) {
5858
NSK_DISPLAY0("Obtain tested object from a static field of debugee class\n");
5959

6060
NSK_DISPLAY1("Find class: %s\n", CLASS_NAME);
61-
if (!NSK_JNI_VERIFY(jni, (testedClass =
62-
NSK_CPP_STUB2(FindClass, jni, CLASS_NAME)) != NULL))
61+
if (!NSK_JNI_VERIFY(jni, (testedClass = jni->FindClass(CLASS_NAME)) != NULL))
6362
return NSK_FALSE;
6463

65-
if (!NSK_JNI_VERIFY(jni, (testedClass = (jclass)
66-
NSK_CPP_STUB2(NewGlobalRef, jni, testedClass)) != NULL))
64+
if (!NSK_JNI_VERIFY(jni, (testedClass = (jclass) jni->NewGlobalRef(testedClass)) != NULL))
6765
return NSK_FALSE;
6866

6967
NSK_DISPLAY2("Find field: %s:%s\n", FIELD_NAME, FIELD_SIGNATURE);
7068
if (!NSK_JNI_VERIFY(jni, (testedFieldID =
71-
NSK_CPP_STUB4(GetStaticFieldID, jni, testedClass,
72-
FIELD_NAME, FIELD_SIGNATURE)) != NULL))
69+
jni->GetStaticFieldID(testedClass, FIELD_NAME, FIELD_SIGNATURE)) != NULL))
7370
return NSK_FALSE;
7471

7572
return NSK_TRUE;
@@ -82,8 +79,7 @@ static int lookup(jvmtiEnv* jvmti,
8279
jint i;
8380

8481
for (i = 0; i < classCount && !found; i++) {
85-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti,
86-
classes[i], &signature, &generic)))
82+
if (!NSK_JVMTI_VERIFY(jvmti->GetClassSignature(classes[i], &signature, &generic)))
8783
break;
8884

8985
if (signature != NULL && strcmp(signature, exp_sig) == 0) {
@@ -92,10 +88,10 @@ static int lookup(jvmtiEnv* jvmti,
9288
}
9389

9490
if (signature != NULL)
95-
NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)signature);
91+
jvmti->Deallocate((unsigned char*)signature);
9692

9793
if (generic != NULL)
98-
NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)generic);
94+
jvmti->Deallocate((unsigned char*)generic);
9995
}
10096

10197
return found;
@@ -119,13 +115,11 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
119115

120116
NSK_DISPLAY0("Testcase #1: check on default classloader\n");
121117
if (!NSK_JNI_VERIFY(jni, (testedClassLoader =
122-
NSK_CPP_STUB3(GetStaticObjectField, jni,
123-
testedClass, testedFieldID)) != NULL)) {
118+
jni->GetStaticObjectField(testedClass, testedFieldID)) != NULL)) {
124119
nsk_jvmti_setFailStatus();
125120
return;
126121
}
127-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassLoaderClasses, jvmti,
128-
testedClassLoader, &classCount, &classes))) {
122+
if (!NSK_JVMTI_VERIFY(jvmti->GetClassLoaderClasses(testedClassLoader, &classCount, &classes))) {
129123
nsk_jvmti_setFailStatus();
130124
return;
131125
}
@@ -143,7 +137,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
143137
return;
144138
}
145139
if (classes != NULL)
146-
NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)classes);
140+
jvmti->Deallocate((unsigned char*)classes);
147141

148142
if (!nsk_jvmti_resumeSync())
149143
return;
@@ -152,13 +146,11 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
152146

153147
NSK_DISPLAY0("Testcase #2: check on custom classloader\n");
154148
if (!NSK_JNI_VERIFY(jni, (testedClassLoader =
155-
NSK_CPP_STUB3(GetStaticObjectField, jni,
156-
testedClass, testedFieldID)) != NULL)) {
149+
jni->GetStaticObjectField(testedClass, testedFieldID)) != NULL)) {
157150
nsk_jvmti_setFailStatus();
158151
return;
159152
}
160-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassLoaderClasses, jvmti,
161-
testedClassLoader, &classCount, &classes))) {
153+
if (!NSK_JVMTI_VERIFY(jvmti->GetClassLoaderClasses(testedClassLoader, &classCount, &classes))) {
162154
nsk_jvmti_setFailStatus();
163155
return;
164156
}
@@ -183,9 +175,9 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
183175
nsk_jvmti_setFailStatus();
184176
}
185177
if (classes != NULL)
186-
NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)classes);
178+
jvmti->Deallocate((unsigned char*)classes);
187179

188-
NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedClass));
180+
NSK_TRACE(jni->DeleteGlobalRef(testedClass));
189181

190182
if (!nsk_jvmti_resumeSync())
191183
return;

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ static int checkSig(JNIEnv *jni_env, jclass testedCls, int idx) {
5858
char *sign;
5959
char *gen_sign;
6060

61-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature,
62-
jvmti, testedCls, &sign, &gen_sign))) {
61+
if (!NSK_JVMTI_VERIFY(jvmti->GetClassSignature(testedCls, &sign, &gen_sign))) {
6362
NSK_COMPLAIN1("TEST FAILED: unable to get class signature for \"%s\"\n\n",
6463
class_sig[idx][0]);
6564
return STATUS_FAILED;
@@ -85,13 +84,11 @@ static int checkSig(JNIEnv *jni_env, jclass testedCls, int idx) {
8584
sign, (gen_sign==NULL)?"NULL":gen_sign);
8685

8786
NSK_DISPLAY0("Deallocating the signature array\n");
88-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
89-
jvmti, (unsigned char*) sign))) {
87+
if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) sign))) {
9088
totRes = STATUS_FAILED;
9189
}
9290
if (gen_sign!=NULL)
93-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
94-
jvmti, (unsigned char*) gen_sign))) {
91+
if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) gen_sign))) {
9592
totRes = STATUS_FAILED;
9693
}
9794

@@ -108,8 +105,7 @@ Java_nsk_jvmti_GetClassSignature_getclsig006_check(
108105
jclass testedCls;
109106

110107
for (i=0; i<CLS_NUM; i++) {
111-
if (!NSK_JNI_VERIFY(jni, (testedCls = NSK_CPP_STUB2(
112-
FindClass, jni, class_sig[i][1])) != NULL)) {
108+
if (!NSK_JNI_VERIFY(jni, (testedCls = jni->FindClass(class_sig[i][1])) != NULL)) {
113109
NSK_COMPLAIN1("TEST FAILURE: unable to find class \"%s\"\n\n",
114110
class_sig[i][0]);
115111
res = STATUS_FAILED;

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTime/curthrcputime001/curthrcputime001.cpp‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ static int checkCpuTime(jvmtiEnv* jvmti, jthread thread, julong* time,
7070
int success = NSK_TRUE;
7171

7272
NSK_DISPLAY1("GetCurrentThreadCpuTime() for current thread: 0x%p\n", (void*)thread);
73-
if (!NSK_JVMTI_VERIFY(
74-
NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, (jlong *)time))) {
73+
if (!NSK_JVMTI_VERIFY(jvmti->GetCurrentThreadCpuTime((jlong *)time))) {
7574
return NSK_FALSE;
7675
}
7776
NSK_DISPLAY1(" ... got cpu time: %s\n", julong_to_string(*time, buf));
@@ -260,8 +259,7 @@ callbackThreadStart(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
260259

261260
jvmtiThreadInfo threadInfo;
262261
{
263-
if (!NSK_JVMTI_VERIFY(
264-
NSK_CPP_STUB3(GetThreadInfo, jvmti, thread, &threadInfo))) {
262+
if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(thread, &threadInfo))) {
265263
nsk_jvmti_setFailStatus();
266264
return;
267265
}
@@ -284,8 +282,7 @@ callbackThreadEnd(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
284282

285283
jvmtiThreadInfo threadInfo;
286284
{
287-
if (!NSK_JVMTI_VERIFY(
288-
NSK_CPP_STUB3(GetThreadInfo, jvmti, thread, &threadInfo))) {
285+
if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(thread, &threadInfo))) {
289286
nsk_jvmti_setFailStatus();
290287
return;
291288
}
@@ -337,8 +334,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
337334

338335
memset(&caps, 0, sizeof(caps));
339336
caps.can_get_current_thread_cpu_time = 1;
340-
if (!NSK_JVMTI_VERIFY(
341-
NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
337+
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
342338
return JNI_ERR;
343339
}
344340
}
@@ -353,9 +349,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
353349
eventCallbacks.VMDeath = callbackVMDeath;
354350
eventCallbacks.ThreadStart = callbackThreadStart;
355351
eventCallbacks.ThreadEnd = callbackThreadEnd;
356-
if (!NSK_JVMTI_VERIFY(
357-
NSK_CPP_STUB3(SetEventCallbacks, jvmti,
358-
&eventCallbacks, sizeof(eventCallbacks)))) {
352+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
359353
return JNI_ERR;
360354
}
361355
}

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTimerInfo/curthrtimerinfo001/curthrtimerinfo001.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ static int checkTimerInfo(jvmtiEnv* jvmti, jvmtiTimerInfo* info,
6666

6767
NSK_DISPLAY0("GetCurrentThreadCpuTimerInfo() for current JVMTI env\n");
6868
if (!NSK_JVMTI_VERIFY(
69-
NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, info))) {
69+
jvmti->GetCurrentThreadCpuTimerInfo(info))) {
7070
return NSK_FALSE;
7171
}
7272
NSK_DISPLAY0("Got timer info:\n");
@@ -260,7 +260,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
260260
memset(&caps, 0, sizeof(caps));
261261
caps.can_get_current_thread_cpu_time = 1;
262262
if (!NSK_JVMTI_VERIFY(
263-
NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
263+
jvmti->AddCapabilities(&caps))) {
264264
return JNI_ERR;
265265
}
266266
}
@@ -276,8 +276,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
276276
eventCallbacks.ThreadStart = callbackThreadStart;
277277
eventCallbacks.ThreadEnd = callbackThreadEnd;
278278
if (!NSK_JVMTI_VERIFY(
279-
NSK_CPP_STUB3(SetEventCallbacks, jvmti,
280-
&eventCallbacks, sizeof(eventCallbacks)))) {
279+
jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
281280
return JNI_ERR;
282281
}
283282
}

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnv/GetEnv001/GetEnv001.cpp‎

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -87,64 +87,29 @@ jint Agent_Initialize(JavaVM *vm, char *options, void *reserved)
8787
return JNI_ERR;
8888
}
8989

90-
if (NSK_CPP_STUB3(
91-
GetEnv
92-
, vm
93-
, (void **) &jvmti
94-
, JVMTI_VERSION_1_1
95-
) != JNI_OK || jvmti == NULL)
96-
{
90+
if (vm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1) != JNI_OK || jvmti == NULL) {
9791
NSK_COMPLAIN0("JVMTI_VERSION_1_1 isn't supported.");
9892
return JNI_OK;
9993
}
10094

101-
if (!NSK_JVMTI_VERIFY(
102-
NSK_CPP_STUB2(
103-
GetCapabilities
104-
, jvmti
105-
, &caps)
106-
)
107-
)
95+
if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
10896
return JNI_ERR;
10997

11098
caps.can_retransform_classes = 1;
11199

112100
// Register all necessary JVM capabilities
113-
if (!NSK_JVMTI_VERIFY(
114-
NSK_CPP_STUB2(
115-
AddCapabilities
116-
, jvmti
117-
, &caps)
118-
)
119-
)
101+
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
120102
return JNI_ERR;
121103

122104
// Register all necessary event callbacks
123105
memset(&callbacks, 0, sizeof(callbacks));
124106
callbacks.ClassFileLoadHook = &ClassFileLoadHook;
125107

126-
if (!NSK_JVMTI_VERIFY(
127-
NSK_CPP_STUB3(
128-
SetEventCallbacks
129-
, jvmti
130-
, &callbacks
131-
, sizeof(callbacks)
132-
)
133-
)
134-
)
108+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
135109
return JNI_ERR;
136110

137111
// Enable class retransformation
138-
if (!NSK_JVMTI_VERIFY(
139-
NSK_CPP_STUB4(
140-
SetEventNotificationMode
141-
, jvmti
142-
, JVMTI_ENABLE
143-
, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK
144-
, NULL
145-
)
146-
)
147-
)
112+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
148113
return JNI_ERR;
149114

150115
return JNI_OK;

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnvironmentLocalStorage/getenvstor001/getenvstor001.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ static int checkEnvStorage(jvmtiEnv* jvmti, const char where[]) {
5353
void* storage = NULL;
5454

5555
NSK_DISPLAY0("GetEnvironmentLocalStorage() for current JVMTI env\n");
56-
if (!NSK_JVMTI_VERIFY(
57-
NSK_CPP_STUB2(GetEnvironmentLocalStorage, jvmti, &storage))) {
56+
if (!NSK_JVMTI_VERIFY(jvmti->GetEnvironmentLocalStorage(&storage))) {
5857
return NSK_FALSE;
5958
}
6059
NSK_DISPLAY1(" ... got storage: 0x%p\n", (void*)storage);
@@ -158,9 +157,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
158157
memset(&eventCallbacks, 0, sizeof(eventCallbacks));
159158
eventCallbacks.VMInit = callbackVMInit;
160159
eventCallbacks.VMDeath = callbackVMDeath;
161-
if (!NSK_JVMTI_VERIFY(
162-
NSK_CPP_STUB3(SetEventCallbacks, jvmti,
163-
&eventCallbacks, sizeof(eventCallbacks)))) {
160+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
164161
return JNI_ERR;
165162
}
166163

0 commit comments

Comments
 (0)