Skip to content

Commit 0b8e1b1

Browse files
GoeLinGoeLin
committed
8211261: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/[A-G]*
Remove the NSK_CPP_STUB macros Backport-of: 57622ed
1 parent a7f1b72 commit 0b8e1b1

File tree

50 files changed

+309
-551
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

+309
-551
lines changed

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps001/addcaps001.cpp‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const
192192
memset(&caps, 0, sizeof(jvmtiCapabilities));
193193

194194
NSK_DISPLAY0("GetCapabilities() for current JVMTI env\n");
195-
if (!NSK_JVMTI_VERIFY(
196-
NSK_CPP_STUB2(GetCapabilities, jvmti, &caps))) {
195+
if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) {
197196
return NSK_FALSE;
198197
}
199198

@@ -216,8 +215,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const
216215
*/
217216
static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char where[]) {
218217
NSK_DISPLAY0("AddCapabilities() for current JVMTI env\n");
219-
if (!NSK_JVMTI_VERIFY(
220-
NSK_CPP_STUB2(AddCapabilities, jvmti, caps))) {
218+
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(caps))) {
221219
return NSK_FALSE;
222220
}
223221
NSK_DISPLAY0(" ... set\n");
@@ -314,9 +312,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
314312
memset(&eventCallbacks, 0, sizeof(eventCallbacks));
315313
eventCallbacks.VMInit = callbackVMInit;
316314
eventCallbacks.VMDeath = callbackVMDeath;
317-
if (!NSK_JVMTI_VERIFY(
318-
NSK_CPP_STUB3(SetEventCallbacks, jvmti,
319-
&eventCallbacks, sizeof(eventCallbacks)))) {
315+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
320316
return JNI_ERR;
321317
}
322318

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const
192192
memset(&caps, 0, sizeof(jvmtiCapabilities));
193193

194194
NSK_DISPLAY0("GetCapabilities() for current JVMTI env\n");
195-
if (!NSK_JVMTI_VERIFY(
196-
NSK_CPP_STUB2(GetCapabilities, jvmti, &caps))) {
195+
if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) {
197196
return NSK_FALSE;
198197
}
199198

@@ -216,8 +215,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const
216215
*/
217216
static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char where[]) {
218217
NSK_DISPLAY0("AddCapabilities() for current JVMTI env\n");
219-
if (!NSK_JVMTI_VERIFY(
220-
NSK_CPP_STUB2(AddCapabilities, jvmti, caps))) {
218+
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(caps))) {
221219
return NSK_FALSE;
222220
}
223221
NSK_DISPLAY0(" ... set\n");
@@ -231,8 +229,7 @@ static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char
231229
*/
232230
static int getPotentialCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) {
233231
NSK_DISPLAY0("GetPotentialCapabilities() for current JVMTI env\n");
234-
if (!NSK_JVMTI_VERIFY(
235-
NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, caps))) {
232+
if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(caps))) {
236233
return NSK_FALSE;
237234
}
238235

@@ -334,9 +331,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
334331
memset(&eventCallbacks, 0, sizeof(eventCallbacks));
335332
eventCallbacks.VMInit = callbackVMInit;
336333
eventCallbacks.VMDeath = callbackVMDeath;
337-
if (!NSK_JVMTI_VERIFY(
338-
NSK_CPP_STUB3(SetEventCallbacks, jvmti,
339-
&eventCallbacks, sizeof(eventCallbacks)))) {
334+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
340335
return JNI_ERR;
341336
}
342337

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/addcaps003.cpp‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const
5757
memset(&caps, 0, sizeof(jvmtiCapabilities));
5858

5959
NSK_DISPLAY0("GetCapabilities() for current JVMTI env\n");
60-
if (!NSK_JVMTI_VERIFY(
61-
NSK_CPP_STUB2(GetCapabilities, jvmti, &caps))) {
60+
if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) {
6261
return NSK_FALSE;
6362
}
6463

@@ -71,8 +70,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const
7170
*/
7271
static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char where[]) {
7372
NSK_DISPLAY0("AddCapabilities() for current JVMTI env\n");
74-
if (!NSK_JVMTI_VERIFY(
75-
NSK_CPP_STUB2(AddCapabilities, jvmti, caps))) {
73+
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(caps))) {
7674
return NSK_FALSE;
7775
}
7876
NSK_DISPLAY0(" ... set\n");
@@ -86,8 +84,7 @@ static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char
8684
*/
8785
static int getPotentialCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) {
8886
NSK_DISPLAY0("GetPotentialCapabilities() for current JVMTI env\n");
89-
if (!NSK_JVMTI_VERIFY(
90-
NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, caps))) {
87+
if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(caps))) {
9188
return NSK_FALSE;
9289
}
9390

@@ -183,9 +180,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
183180
memset(&eventCallbacks, 0, sizeof(eventCallbacks));
184181
eventCallbacks.VMInit = callbackVMInit;
185182
eventCallbacks.VMDeath = callbackVMDeath;
186-
if (!NSK_JVMTI_VERIFY(
187-
NSK_CPP_STUB3(SetEventCallbacks, jvmti,
188-
&eventCallbacks, sizeof(eventCallbacks)))) {
183+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
189184
return JNI_ERR;
190185
}
191186

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ int registerNativeMethods(JNIEnv* jni) {
7474
jint nativeMethodsNumber = 1;
7575

7676
if (!NSK_JNI_VERIFY(jni, (appClass =
77-
NSK_CPP_STUB2(FindClass, jni, ATTACH002_TARGET_APP_CLASS_NAME)) != NULL)) {
77+
jni->FindClass(ATTACH002_TARGET_APP_CLASS_NAME)) != NULL)) {
7878
return NSK_FALSE;
7979
}
8080

8181
if (!NSK_JNI_VERIFY(jni,
82-
(NSK_CPP_STUB4(RegisterNatives, jni, appClass, nativeMethods, nativeMethodsNumber) == 0))) {
82+
(jni->RegisterNatives(appClass, nativeMethods, nativeMethodsNumber) == 0))) {
8383
return NSK_FALSE;
8484
}
8585

@@ -205,7 +205,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved)
205205
memset(&caps, 0, sizeof(caps));
206206
caps.can_generate_all_class_hook_events = 1;
207207
caps.can_redefine_classes = 1;
208-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)) ) {
208+
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) {
209209
/*
210210
* If VM is run with -Xshare:on agent can't get required capabilities (see 6718407)
211211
*/
@@ -222,7 +222,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved)
222222
eventCallbacks.ClassLoad = classLoadHandler;
223223
eventCallbacks.ClassPrepare = classPrepareHandler;
224224
eventCallbacks.ClassFileLoadHook = classFileLoadHoockHandler;
225-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) {
225+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
226226
return JNI_ERR;
227227
}
228228

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,13 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved)
106106
memset(&caps, 0, sizeof(caps));
107107
caps.can_redefine_classes = 1;
108108
caps.can_generate_vm_object_alloc_events = 1;
109-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)) ) {
109+
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) {
110110
return JNI_ERR;
111111
}
112112

113113
memset(&eventCallbacks,0, sizeof(eventCallbacks));
114114
eventCallbacks.VMObjectAlloc = vmObjectAllocHandler;
115-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) {
115+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
116116
return JNI_ERR;
117117
}
118118

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved)
123123

124124
memset(&caps, 0, sizeof(caps));
125125
caps.can_generate_monitor_events = 1;
126-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)) ) {
126+
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) {
127127
return JNI_ERR;
128128
}
129129

130130
memset(&eventCallbacks,0, sizeof(eventCallbacks));
131131
eventCallbacks.MonitorContendedEntered = monitorContentedEnteredHandler;
132132
eventCallbacks.MonitorContendedEnter = monitorContentedEnterHandler;
133-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) {
133+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
134134
return JNI_ERR;
135135
}
136136

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ classLoadHandler(jvmtiEnv *jvmti,
8282
return;
8383
}
8484

85-
if (!NSK_JVMTI_VERIFY( NSK_CPP_STUB4(
86-
SetEventNotificationMode, jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_LOAD, thread) ) ) {
85+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_LOAD, thread) ) ) {
8786
NSK_COMPLAIN1("Failed to enable events for thread '%s'\n", mainThreadName);
8887
nsk_aod_agentFinished(jni, agentName, 0);
8988
return;
@@ -142,7 +141,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved)
142141

143142
memset(&eventCallbacks,0, sizeof(eventCallbacks));
144143
eventCallbacks.ClassLoad = classLoadHandler;
145-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) {
144+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
146145
return JNI_ERR;
147146
}
148147

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved)
6565
if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL))
6666
return JNI_ERR;
6767

68-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)) ) {
68+
if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)) ) {
6969
return JNI_ERR;
7070
}
7171

@@ -75,7 +75,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved)
7575

7676
NSK_DISPLAY1("%s: trying to get all potential capabilities:\n", agentName);
7777

78-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)) ) {
78+
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) {
7979
return JNI_ERR;
8080
}
8181

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ classLoadHandler(jvmtiEnv *jvmti,
6262
if (!nsk_jvmti_aod_disableEvent(jvmti, JVMTI_EVENT_CLASS_LOAD))
6363
success = 0;
6464

65-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB1(DisposeEnvironment, jvmti))) {
65+
if (!NSK_JVMTI_VERIFY(jvmti->DisposeEnvironment())) {
6666
success = 0;
6767
NSK_COMPLAIN1("%s: failed to dispose environment\n", agentName);
6868
} else {
@@ -104,7 +104,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved)
104104

105105
memset(&eventCallbacks,0, sizeof(eventCallbacks));
106106
eventCallbacks.ClassLoad = classLoadHandler;
107-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) {
107+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
108108
return JNI_ERR;
109109
}
110110

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved)
9797

9898
memset(&eventCallbacks,0, sizeof(eventCallbacks));
9999
eventCallbacks.ClassPrepare = classPrepareHandler;
100-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) {
100+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
101101
return JNI_ERR;
102102
}
103103

0 commit comments

Comments
 (0)