Skip to content

Commit 87c04f2

Browse files
GoeLinGoeLin
committed
8211801: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/scenarios/[A-E]
Remove the NSK_CPP_STUB macros Backport-of: efa175f
1 parent 84a3397 commit 87c04f2

File tree

50 files changed

+1986
-2636
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

+1986
-2636
lines changed

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP06/ap06t001/ap06t001.cpp‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ objectReferenceCallback( jvmtiObjectReferenceKind reference_kind,
124124
JNIEXPORT void JNICALL
125125
Java_nsk_jvmti_scenarios_allocation_AP06_ap06t001Thread_setTag( JNIEnv* jni, jobject obj) {
126126

127-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, obj, threadTag))) {
127+
if (!NSK_JVMTI_VERIFY(jvmti->SetTag(obj, threadTag))) {
128128
nsk_jvmti_setFailStatus();
129129
} else {
130130
NSK_DISPLAY0("setTag: the tag was set for checked thread.");
@@ -153,34 +153,26 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
153153
}
154154

155155
if (!NSK_JNI_VERIFY(jni, (fid =
156-
NSK_CPP_STUB4(GetStaticFieldID, jni,
157-
debugeeClass,
158-
"thread",
159-
THREAD_CLS_SIGNATURE)) != NULL )) {
156+
jni->GetStaticFieldID(debugeeClass, "thread", THREAD_CLS_SIGNATURE)) != NULL)) {
160157
nsk_jvmti_setFailStatus();
161158
break;
162159
}
163160

164161
if (!NSK_JNI_VERIFY(jni, (localRefThread =
165-
NSK_CPP_STUB3(GetStaticObjectField, jni,
166-
debugeeClass,
167-
fid )) != NULL )) {
162+
jni->GetStaticObjectField(debugeeClass, fid)) != NULL)) {
168163
NSK_COMPLAIN0("GetStaticObjectField returned NULL for 'thread' field value\n\n");
169164
nsk_jvmti_setFailStatus();
170165
break;
171166
}
172167

173-
if (!NSK_JNI_VERIFY(jni, (globalRefThread =
174-
NSK_CPP_STUB2(NewGlobalRef, jni, localRefThread)) != NULL))
168+
if (!NSK_JNI_VERIFY(jni, (globalRefThread = jni->NewGlobalRef(localRefThread)) != NULL))
175169
return;
176170

177171
NSK_DISPLAY0("Calling IterateOverReachableObjects\n");
178-
if (!NSK_JVMTI_VERIFY(
179-
NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
180-
heapRootCallback,
181-
stackReferenceCallback,
182-
objectReferenceCallback,
183-
NULL /*user_data*/))) {
172+
if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(heapRootCallback,
173+
stackReferenceCallback,
174+
objectReferenceCallback,
175+
NULL /*user_data*/))) {
184176
nsk_jvmti_setFailStatus();
185177
break;
186178
}
@@ -234,12 +226,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
234226
memset(&caps, 0, sizeof(jvmtiCapabilities));
235227
caps.can_tag_objects = 1;
236228

237-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities,
238-
jvmti, &caps)))
229+
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
239230
return JNI_ERR;
240231

241-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities,
242-
jvmti, &caps)))
232+
if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
243233
return JNI_ERR;
244234

245235
if (!caps.can_tag_objects)

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t001/ap07t001.cpp‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,14 @@ Java_nsk_jvmti_scenarios_allocation_AP07_ap07t001_setTag( JNIEnv* jni,
111111
jobject target,
112112
jlong tag ) {
113113

114-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, target, tag))) {
114+
if (!NSK_JVMTI_VERIFY(jvmti->SetTag(target, tag))) {
115115
nsk_jvmti_setFailStatus();
116116
}
117117
}
118118

119119
JNIEXPORT void JNICALL
120120
Java_nsk_jvmti_scenarios_allocation_AP07_ap07t001_setRoot( JNIEnv* jni, jobject obj) {
121-
if (!NSK_JNI_VERIFY(jni, (root =
122-
NSK_CPP_STUB2(NewGlobalRef, jni, obj)) != NULL))
121+
if (!NSK_JNI_VERIFY(jni, (root = jni->NewGlobalRef(obj)) != NULL))
123122
nsk_jvmti_setFailStatus();
124123
}
125124

@@ -135,30 +134,24 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
135134
do {
136135

137136
NSK_DISPLAY0("Calling IterateOverReachableObjects\n");
138-
if (!NSK_JVMTI_VERIFY(
139-
NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
140-
heapRootCallback,
141-
stackReferenceCallback,
142-
objectReferenceCallback,
143-
NULL /*user_data*/))) {
137+
if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(heapRootCallback,
138+
stackReferenceCallback,
139+
objectReferenceCallback,
140+
NULL /*user_data*/))) {
144141
nsk_jvmti_setFailStatus();
145142
break;
146143
}
147144

148145
NSK_DISPLAY0("Calling IterateOverObjectsReachableFromObject\n");
149146
{
150-
if (!NSK_JVMTI_VERIFY(
151-
NSK_CPP_STUB4(IterateOverObjectsReachableFromObject,
152-
jvmti,
153-
root,
154-
objectReferenceCallback,
155-
NULL /*user_data*/))) {
147+
if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject(
148+
root, objectReferenceCallback, NULL /*user_data*/))) {
156149
nsk_jvmti_setFailStatus();
157150
break;
158151
}
159152
}
160153

161-
NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, root));
154+
NSK_TRACE(jni->DeleteGlobalRef(root));
162155

163156
} while (0);
164157

@@ -191,12 +184,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
191184
memset(&caps, 0, sizeof(jvmtiCapabilities));
192185
caps.can_tag_objects = 1;
193186

194-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities,
195-
jvmti, &caps)))
187+
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
196188
return JNI_ERR;
197189

198-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities,
199-
jvmti, &caps)))
190+
if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
200191
return JNI_ERR;
201192

202193
if (!caps.can_tag_objects)

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t002/ap07t002.cpp‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Java_nsk_jvmti_scenarios_allocation_AP07_ap07t002_setTag( JNIEnv* jni,
111111
jobject target,
112112
jlong tag ) {
113113

114-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, target, tag))) {
114+
if (!NSK_JVMTI_VERIFY(jvmti->SetTag(target, tag))) {
115115
nsk_jvmti_setFailStatus();
116116
}
117117
}
@@ -128,12 +128,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
128128
do {
129129

130130
NSK_DISPLAY0("Calling IterateOverReachableObjects\n");
131-
if (!NSK_JVMTI_VERIFY(
132-
NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
133-
heapRootCallback,
134-
stackReferenceCallback,
135-
objectReferenceCallback,
136-
NULL /*user_data*/))) {
131+
if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(heapRootCallback,
132+
stackReferenceCallback,
133+
objectReferenceCallback,
134+
NULL /*user_data*/))) {
137135
nsk_jvmti_setFailStatus();
138136
break;
139137
}
@@ -169,12 +167,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
169167
memset(&caps, 0, sizeof(jvmtiCapabilities));
170168
caps.can_tag_objects = 1;
171169

172-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities,
173-
jvmti, &caps)))
170+
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
174171
return JNI_ERR;
175172

176-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities,
177-
jvmti, &caps)))
173+
if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
178174
return JNI_ERR;
179175

180176
if (!caps.can_tag_objects)

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP09/ap09t001/ap09t001.cpp‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,14 @@ Java_nsk_jvmti_scenarios_allocation_AP09_ap09t001_setTag( JNIEnv* jni,
132132
jobject target,
133133
jlong tag ) {
134134

135-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, target, tag))) {
135+
if (!NSK_JVMTI_VERIFY(jvmti->SetTag(target, tag))) {
136136
nsk_jvmti_setFailStatus();
137137
}
138138
}
139139

140140
JNIEXPORT void JNICALL
141141
Java_nsk_jvmti_scenarios_allocation_AP09_ap09t001_setReferrer( JNIEnv* jni, jclass klass, jobject ref) {
142-
if (!NSK_JNI_VERIFY(jni, (referrer =
143-
NSK_CPP_STUB2(NewGlobalRef, jni, ref)) != NULL))
142+
if (!NSK_JNI_VERIFY(jni, (referrer = jni->NewGlobalRef(ref)) != NULL))
144143
nsk_jvmti_setFailStatus();
145144
}
146145

@@ -155,12 +154,9 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
155154

156155
do {
157156
NSK_DISPLAY0("\nCalling IterateOverObjectsReachableFromObject\n");
158-
if (!NSK_JVMTI_VERIFY(
159-
NSK_CPP_STUB4(IterateOverObjectsReachableFromObject,
160-
jvmti,
161-
referrer,
162-
objectReferenceCallback,
163-
NULL /*user_data*/))) {
157+
if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject(referrer,
158+
objectReferenceCallback,
159+
NULL /*user_data*/))) {
164160
nsk_jvmti_setFailStatus();
165161
}
166162
if (!classFound) {
@@ -192,7 +188,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
192188
nsk_jvmti_setFailStatus();
193189
}
194190

195-
NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, referrer));
191+
NSK_TRACE(jni->DeleteGlobalRef(referrer));
196192
} while (0);
197193

198194
NSK_DISPLAY0("Let debugee to finish\n");
@@ -224,12 +220,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
224220
memset(&caps, 0, sizeof(jvmtiCapabilities));
225221
caps.can_tag_objects = 1;
226222

227-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities,
228-
jvmti, &caps)))
223+
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
229224
return JNI_ERR;
230225

231-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities,
232-
jvmti, &caps)))
226+
if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
233227
return JNI_ERR;
234228

235229
if (!caps.can_tag_objects) {

‎test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/ap10t001.cpp‎

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ static void envStorageFunc(jvmtiEnv *jvmti_env, const char *msg) {
6161

6262
NSK_DISPLAY2("%s: setting an environment local storage 0x%p ...\n",
6363
msg, (void*) &stor);
64-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(SetEnvironmentLocalStorage,
65-
jvmti_env, (const void*) &stor))) {
64+
if (!NSK_JVMTI_VERIFY(jvmti_env->SetEnvironmentLocalStorage((const void*) &stor))) {
6665
nsk_jvmti_setFailStatus();
6766
NSK_COMPLAIN1("%s: unable to set an environment local storage\n\n",
6867
msg);
@@ -71,8 +70,7 @@ static void envStorageFunc(jvmtiEnv *jvmti_env, const char *msg) {
7170

7271
NSK_DISPLAY1("%s: getting an environment local storage ...\n",
7372
msg);
74-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetEnvironmentLocalStorage,
75-
jvmti_env, (void**) &obtainedData))) {
73+
if (!NSK_JVMTI_VERIFY(jvmti_env->GetEnvironmentLocalStorage((void**) &obtainedData))) {
7674
nsk_jvmti_setFailStatus();
7775
NSK_COMPLAIN1("%s: unable to get an environment local storage\n\n",
7876
msg);
@@ -90,8 +88,7 @@ static void envStorageFunc(jvmtiEnv *jvmti_env, const char *msg) {
9088
}
9189

9290
static void timerFunc(jvmtiEnv *jvmti_env, const char *msg) {
93-
if (!NSK_JVMTI_VERIFY(
94-
NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti_env, &timer_info1 ))) {
91+
if (!NSK_JVMTI_VERIFY(jvmti_env->GetCurrentThreadCpuTimerInfo(&timer_info1))) {
9592
nsk_jvmti_setFailStatus();
9693
NSK_COMPLAIN1("%s: GetCurrentThreadCpuTimerInfo returned unexpected error code\n\n",
9794
msg);
@@ -114,17 +111,15 @@ static void timerFunc(jvmtiEnv *jvmti_env, const char *msg) {
114111
}
115112
/* ---------------------------------------------------------------------- */
116113

117-
if (!NSK_JVMTI_VERIFY(
118-
NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti_env, &nanos ))) {
114+
if (!NSK_JVMTI_VERIFY(jvmti_env->GetCurrentThreadCpuTime(&nanos))) {
119115
nsk_jvmti_setFailStatus();
120116
NSK_COMPLAIN1("%s: GetCurrentThreadCpuTime returned unexpected error code\n\n",
121117
msg);
122118
}
123119
/* ---------------------------------------------------------------------- */
124120

125121

126-
if (!NSK_JVMTI_VERIFY(
127-
NSK_CPP_STUB2(GetTimerInfo, jvmti_env, &timer_info2 ))) {
122+
if (!NSK_JVMTI_VERIFY(jvmti_env->GetTimerInfo(&timer_info2))) {
128123
nsk_jvmti_setFailStatus();
129124
NSK_COMPLAIN1("%s: GetTimerInfo returned unexpected error code\n\n",
130125
msg);
@@ -148,8 +143,7 @@ static void timerFunc(jvmtiEnv *jvmti_env, const char *msg) {
148143
/* ---------------------------------------------------------------------- */
149144

150145
nanos = 0;
151-
if (!NSK_JVMTI_VERIFY(
152-
NSK_CPP_STUB2(GetTime, jvmti_env, &nanos ))) {
146+
if (!NSK_JVMTI_VERIFY(jvmti_env->GetTime(&nanos))) {
153147
nsk_jvmti_setFailStatus();
154148
NSK_COMPLAIN1("%s: GetTime returned unexpected error code\n\n",
155149
msg);
@@ -223,10 +217,9 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
223217

224218
NSK_DISPLAY0("Call IterateOverHeap to tag random objects for ObjectFree evnts\n\n");
225219
{
226-
if (!NSK_JVMTI_VERIFY(
227-
NSK_CPP_STUB4(IterateOverHeap, jvmti,
228-
JVMTI_HEAP_OBJECT_UNTAGGED, heapObjectCallback,
229-
&user_data))) {
220+
if (!NSK_JVMTI_VERIFY(jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_UNTAGGED,
221+
heapObjectCallback,
222+
&user_data))) {
230223
nsk_jvmti_setFailStatus();
231224
}
232225
}
@@ -276,12 +269,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
276269
caps.can_get_thread_cpu_time = 1;
277270
caps.can_generate_object_free_events = 1;
278271
caps.can_generate_garbage_collection_events = 1;
279-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities,
280-
jvmti, &caps)))
272+
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
281273
return JNI_ERR;
282274

283-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities,
284-
jvmti, &caps)))
275+
if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
285276
return JNI_ERR;
286277

287278
if (!caps.can_generate_garbage_collection_events)
@@ -299,19 +290,21 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
299290
callbacks.GarbageCollectionFinish = &GarbageCollectionFinish;
300291
callbacks.ObjectFree = &ObjectFree;
301292

302-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks,
303-
jvmti, &callbacks, sizeof(callbacks))))
293+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
304294
return JNI_ERR;
305295

306296
NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n");
307-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
308-
jvmti, JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_START, NULL)))
297+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE,
298+
JVMTI_EVENT_GARBAGE_COLLECTION_START,
299+
NULL)))
309300
return JNI_ERR;
310-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
311-
jvmti, JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL)))
301+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE,
302+
JVMTI_EVENT_GARBAGE_COLLECTION_FINISH,
303+
NULL)))
312304
return JNI_ERR;
313-
if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
314-
jvmti, JVMTI_ENABLE, JVMTI_EVENT_OBJECT_FREE, NULL)))
305+
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE,
306+
JVMTI_EVENT_OBJECT_FREE,
307+
NULL)))
315308
return JNI_ERR;
316309
NSK_DISPLAY0("enabling the events done\n\n");
317310

0 commit comments

Comments
 (0)