< prev index next >
test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002.cpp
Print this page
rev 52050 : [mq]: refactor
@@ -79,37 +79,32 @@
jfieldID fid = NULL;
NSK_DISPLAY0("Obtain tested object from a static field of debugee class\n");
NSK_DISPLAY1("Find class: %s\n", CLASS_NAME);
- if (!NSK_JNI_VERIFY(jni, (testedClass =
- NSK_CPP_STUB2(FindClass, jni, CLASS_NAME)) != NULL))
+ if (!NSK_JNI_VERIFY(jni, (testedClass = jni->FindClass(CLASS_NAME)) != NULL))
return NSK_FALSE;
- if (!NSK_JNI_VERIFY(jni, (testedClass = (jclass)
- NSK_CPP_STUB2(NewGlobalRef, jni, testedClass)) != NULL))
+ if (!NSK_JNI_VERIFY(jni, (testedClass = (jclass) jni->NewGlobalRef(testedClass)) != NULL))
return NSK_FALSE;
NSK_DISPLAY2("Find field: %s:%s\n", FIELD_NAME, FIELD_SIGNATURE);
if (!NSK_JNI_VERIFY(jni, (fid =
- NSK_CPP_STUB4(GetStaticFieldID, jni, testedClass,
- FIELD_NAME, FIELD_SIGNATURE)) != NULL))
+ jni->GetStaticFieldID(testedClass, FIELD_NAME, FIELD_SIGNATURE)) != NULL))
return NSK_FALSE;
- if (!NSK_JNI_VERIFY(jni, (testedObject =
- NSK_CPP_STUB3(GetStaticObjectField, jni, testedClass, fid)) != NULL))
+ if (!NSK_JNI_VERIFY(jni, (testedObject = jni->GetStaticObjectField(testedClass, fid)) != NULL))
return NSK_FALSE;
NSK_DISPLAY2("Find class instance: %s:%s\n",
INSTANCE_NAME, INSTANCE_SIGNATURE);
if (!NSK_JNI_VERIFY(jni, (fid =
- NSK_CPP_STUB4(GetStaticFieldID, jni, testedClass,
- INSTANCE_NAME, INSTANCE_SIGNATURE)) != NULL))
+ jni->GetStaticFieldID(testedClass, INSTANCE_NAME, INSTANCE_SIGNATURE)) != NULL))
return NSK_FALSE;
if (!NSK_JNI_VERIFY(jni, (testedInstance =
- NSK_CPP_STUB3(GetStaticObjectField, jni, testedClass, fid)) != NULL))
+ jni->GetStaticObjectField(testedClass, fid)) != NULL))
return NSK_FALSE;
return NSK_TRUE;
}
@@ -129,12 +124,11 @@
}
NSK_DISPLAY0("Testcase #1: check that there are no tagged objects\n");
ObjectsCount = 0;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(IterateOverHeap, jvmti,
- JVMTI_HEAP_OBJECT_EITHER, heap_object_callback, &dummy))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_EITHER, heap_object_callback, &dummy))) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("ObjectsCount = %d\n", ObjectsCount);
if (ObjectsCount != 0) {
@@ -142,12 +136,11 @@
ObjectsCount);
nsk_jvmti_setFailStatus();
}
ObjectsCount = 0;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(IterateOverHeap, jvmti,
- JVMTI_HEAP_OBJECT_TAGGED, heap_object_callback, &dummy))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, heap_object_callback, &dummy))) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("ObjectsCount = %d\n", ObjectsCount);
if (ObjectsCount != 0) {
@@ -155,12 +148,14 @@
ObjectsCount);
nsk_jvmti_setFailStatus();
}
ObjectsCount = 0;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti,
- testedClass, JVMTI_HEAP_OBJECT_EITHER, heap_object_callback, &dummy))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->IterateOverInstancesOfClass(testedClass,
+ JVMTI_HEAP_OBJECT_EITHER,
+ heap_object_callback,
+ &dummy))) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("ObjectsCount = %d\n", ObjectsCount);
if (ObjectsCount != 0) {
@@ -168,24 +163,25 @@
ObjectsCount);
nsk_jvmti_setFailStatus();
}
ObjectsCount = 0;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti,
- testedClass, JVMTI_HEAP_OBJECT_TAGGED, heap_object_callback, &dummy))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->IterateOverInstancesOfClass(testedClass,
+ JVMTI_HEAP_OBJECT_TAGGED,
+ heap_object_callback,
+ &dummy))) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("ObjectsCount = %d\n", ObjectsCount);
if (ObjectsCount != 0) {
NSK_COMPLAIN1("Some class instances were unexpectedly tagged: %d\n",
ObjectsCount);
nsk_jvmti_setFailStatus();
}
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, testedObject,
- SAMPLE_TAG))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetTag(testedObject, SAMPLE_TAG))) {
nsk_jvmti_setFailStatus();
return;
}
if (!NSK_VERIFY(nsk_jvmti_resumeSync()))
@@ -195,48 +191,46 @@
NSK_DISPLAY0("Testcase #2: check that there is only one object tagged\n");
ObjectsCount = 0;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(IterateOverHeap, jvmti,
- JVMTI_HEAP_OBJECT_EITHER, heap_object_callback, &dummy))) {
+ if (!NSK_JVMTI_VERIFY(
+ jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_EITHER, heap_object_callback, &dummy))) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("ObjectsCount = %d\n", ObjectsCount);
if (ObjectsCount != 1) {
NSK_COMPLAIN1("Expected 1 object to be tagged: %d\n", ObjectsCount);
nsk_jvmti_setFailStatus();
}
ObjectsCount = 0;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(IterateOverHeap, jvmti,
- JVMTI_HEAP_OBJECT_TAGGED, heap_object_callback, &dummy))) {
+ if (!NSK_JVMTI_VERIFY(
+ jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, heap_object_callback, &dummy))) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("ObjectsCount = %d\n", ObjectsCount);
if (ObjectsCount != 1) {
NSK_COMPLAIN1("Expected 1 object to be tagged: %d\n", ObjectsCount);
nsk_jvmti_setFailStatus();
}
ObjectsCount = 0;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(IterateOverHeap, jvmti,
- JVMTI_HEAP_OBJECT_UNTAGGED, heap_object_callback, &dummy))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_UNTAGGED, heap_object_callback, &dummy))) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("ObjectsCount = %d\n", ObjectsCount);
if (ObjectsCount != 0) {
NSK_COMPLAIN1("Some tagged objects were unexpectedly shown as untagged: %d\n",
ObjectsCount);
nsk_jvmti_setFailStatus();
}
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, testedInstance,
- SAMPLE_TAG))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetTag(testedInstance, SAMPLE_TAG))) {
nsk_jvmti_setFailStatus();
return;
}
if (!NSK_VERIFY(nsk_jvmti_resumeSync()))
@@ -246,12 +240,14 @@
NSK_DISPLAY0("Testcase #3: check that there is only one class object tagged\n");
ObjectsCount = 0;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti,
- testedClass, JVMTI_HEAP_OBJECT_EITHER, heap_object_callback, &dummy))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->IterateOverInstancesOfClass(testedClass,
+ JVMTI_HEAP_OBJECT_EITHER,
+ heap_object_callback,
+ &dummy))) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("ObjectsCount = %d\n", ObjectsCount);
if (ObjectsCount != 1) {
@@ -259,12 +255,14 @@
ObjectsCount);
nsk_jvmti_setFailStatus();
}
ObjectsCount = 0;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti,
- testedClass, JVMTI_HEAP_OBJECT_EITHER, heap_object_callback, &dummy))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->IterateOverInstancesOfClass(testedClass,
+ JVMTI_HEAP_OBJECT_EITHER,
+ heap_object_callback,
+ &dummy))) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("ObjectsCount = %d\n", ObjectsCount);
if (ObjectsCount != 1) {
@@ -272,12 +270,11 @@
ObjectsCount);
nsk_jvmti_setFailStatus();
}
ObjectsCount = 0;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(IterateOverHeap, jvmti,
- JVMTI_HEAP_OBJECT_UNTAGGED, heap_object_callback, &dummy))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_UNTAGGED, heap_object_callback, &dummy))) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("ObjectsCount = %d\n", ObjectsCount);
if (ObjectsCount != 0) {
@@ -285,11 +282,11 @@
ObjectsCount);
nsk_jvmti_setFailStatus();
}
- NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedClass));
+ NSK_TRACE(jni->DeleteGlobalRef(testedClass));
if (!nsk_jvmti_resumeSync())
return;
}
@@ -324,23 +321,22 @@
return JNI_ERR;
memset(&caps, 0, sizeof(caps));
caps.can_tag_objects = 1;
caps.can_generate_object_free_events = 1;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
return JNI_ERR;
}
if (!NSK_VERIFY(nsk_jvmti_setAgentProc(agentProc, NULL)))
return JNI_ERR;
memset(&callbacks, 0, sizeof(callbacks));
if (!NSK_VERIFY(nsk_jvmti_init_MA(&callbacks)))
return JNI_ERR;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_OBJECT_FREE, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_OBJECT_FREE, NULL)))
return JNI_ERR;
return JNI_OK;
}
< prev index next >