8212535: Remove spaces before/after () for vmTestbase/[a-j]*
Summary: Remove white spaces from tests
Reviewed-by: amenkov, cjplummer, phh, sspitsyn
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC01/libnativeGC01.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC01/libnativeGC01.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -27,7 +27,7 @@
extern "C" {
/*
- * A C function that takes a reference to java Object( a circular Linked list)
+ * A C function that takes a reference to java Object (a circular Linked list)
* and utilizes this reference to do a java method callback to determine the
* number of elements in the linked list
*/
@@ -55,8 +55,8 @@
*/
clss = env->GetObjectClass(linked_list);
- mid2 = env->GetMethodID(clss, "getLength", "()I" );
- if (mid2 == 0) {
+ mid2 = env->GetMethodID(clss, "getLength", "()I");
+ if (mid2 == 0) {
printf("couldnt locate method getLength()");
return -1;
}
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC02/libnativeGC02.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC02/libnativeGC02.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -25,7 +25,7 @@
extern "C" {
-/* A C function that takes a reference to java Object( a circular Linked list)
+/* A C function that takes a reference to java Object(a circular Linked list)
and utilizes this reference to do a java method callback to determine the
number of elements in the linked list */
JNIEXPORT jint JNICALL
@@ -51,9 +51,9 @@
/* force a GC by invoking a callback where System.gc() is called
*/
- cls = env->GetObjectClass(obj);
+ cls = env->GetObjectClass(obj);
mid = env->GetMethodID(cls, "callbackGC", "()V");
- if (mid == 0){
+ if (mid == 0) {
printf("couldnt locate method callbackGC()\n");
return -1;
}
@@ -65,12 +65,12 @@
*/
clss = env->GetObjectClass(linked_list);
- mid2 = env->GetMethodID(clss, "getLength", "(Lnsk/share/gc/CircularLinkedList;)I" );
- if (mid2 == 0 ){
+ mid2 = env->GetMethodID(clss, "getLength", "(Lnsk/share/gc/CircularLinkedList;)I");
+ if (mid2 == 0) {
printf("couldnt locate method getLength(CircularLinkedList)\n");
return -1;
}
- elementCount = env->CallIntMethod(linked_list, mid2, llist);
+ elementCount = env->CallIntMethod(linked_list, mid2, llist);
return elementCount;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -142,7 +142,7 @@
break;
}
- if (printdump == JNI_TRUE && (memCount % 50 == 0) ) {
+ if (printdump == JNI_TRUE && (memCount % 50 == 0)) {
printf(">>> ... done (%dMb)\n", memCount);
}
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -205,7 +205,7 @@
memset(&caps, 0, sizeof(caps));
caps.can_generate_all_class_hook_events = 1;
caps.can_redefine_classes = 1;
- if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
/*
* If VM is run with -Xshare:on agent can't get required capabilities (see 6718407)
*/
@@ -222,7 +222,7 @@
eventCallbacks.ClassLoad = classLoadHandler;
eventCallbacks.ClassPrepare = classPrepareHandler;
eventCallbacks.ClassFileLoadHook = classFileLoadHoockHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -106,13 +106,13 @@
memset(&caps, 0, sizeof(caps));
caps.can_redefine_classes = 1;
caps.can_generate_vm_object_alloc_events = 1;
- if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
return JNI_ERR;
}
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.VMObjectAlloc = vmObjectAllocHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -123,14 +123,14 @@
memset(&caps, 0, sizeof(caps));
caps.can_generate_monitor_events = 1;
- if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
return JNI_ERR;
}
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.MonitorContendedEntered = monitorContentedEnteredHandler;
eventCallbacks.MonitorContendedEnter = monitorContentedEnterHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -82,7 +82,7 @@
return;
}
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_LOAD, thread) ) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_LOAD, thread))) {
NSK_COMPLAIN1("Failed to enable events for thread '%s'\n", mainThreadName);
nsk_aod_agentFinished(jni, agentName, 0);
return;
@@ -141,7 +141,7 @@
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.ClassLoad = classLoadHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -65,7 +65,7 @@
if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL))
return JNI_ERR;
- if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps))) {
return JNI_ERR;
}
@@ -75,7 +75,7 @@
NSK_DISPLAY1("%s: trying to get all potential capabilities:\n", agentName);
- if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -104,7 +104,7 @@
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.ClassLoad = classLoadHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -97,7 +97,7 @@
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.ClassPrepare = classPrepareHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent01.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent01.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -97,7 +97,7 @@
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.ClassLoad = classLoadHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -118,7 +118,7 @@
if (!NSK_VERIFY((thread = nsk_jvmti_aod_createThread(jni)) != NULL))
return NSK_FALSE;
- if (!NSK_JVMTI_VERIFY(jvmti->RunAgentThread(thread, auxiliaryThreadFunction, NULL, JVMTI_THREAD_NORM_PRIORITY ))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->RunAgentThread(thread, auxiliaryThreadFunction, NULL, JVMTI_THREAD_NORM_PRIORITY))) {
return NSK_FALSE;
}
@@ -165,14 +165,14 @@
memset(&caps, 0, sizeof(caps));
caps.can_generate_garbage_collection_events = 1;
- if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
return JNI_ERR;
}
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.GarbageCollectionStart = garbageCollectionStartHandler;
eventCallbacks.GarbageCollectionFinish = garbageCollectionFinishHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -142,13 +142,13 @@
memset(&caps, 0, sizeof(caps));
caps.can_tag_objects = 1;
caps.can_generate_object_free_events = 1;
- if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
return JNI_ERR;
}
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.ObjectFree = objectFreeHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -203,14 +203,14 @@
caps.can_tag_objects = 1;
caps.can_generate_object_free_events = 1;
caps.can_generate_vm_object_alloc_events = 1;
- if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
return JNI_ERR;
}
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.ObjectFree = objectFreeHandler;
eventCallbacks.VMObjectAlloc = vmObjectAllocHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -122,14 +122,14 @@
memset(&caps, 0, sizeof(caps));
caps.can_generate_monitor_events = 1;
- if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
return JNI_ERR;
}
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.MonitorWaited = monitorWaitedHandler;
eventCallbacks.MonitorWait = monitorWaitHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -119,7 +119,7 @@
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.ThreadEnd = threadEndHandler;
eventCallbacks.ThreadStart = threadStartHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -68,7 +68,7 @@
if (!NSK_VERIFY((thread = nsk_jvmti_aod_createThreadWithName(jni, STARTED_THREAD_NAME)) != NULL))
return NSK_FALSE;
- if (!NSK_JVMTI_VERIFY(jvmti->RunAgentThread(thread, startedThreadFunction, NULL, JVMTI_THREAD_NORM_PRIORITY ))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->RunAgentThread(thread, startedThreadFunction, NULL, JVMTI_THREAD_NORM_PRIORITY))) {
return NSK_FALSE;
}
@@ -154,7 +154,7 @@
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.ThreadEnd = threadEndHandler;
eventCallbacks.ThreadStart = threadStartHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach040/attach040Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach040/attach040Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -150,7 +150,7 @@
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.ThreadStart = threadStartHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach041/attach041Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach041/attach041Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -172,7 +172,7 @@
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.ThreadStart = threadStartHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach042/attach042Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach042/attach042Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -136,7 +136,7 @@
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.ThreadStart = threadStartHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -114,7 +114,7 @@
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.ClassLoad = classLoadHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent01.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent01.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -125,7 +125,7 @@
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.ClassPrepare = classPrepareHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -146,7 +146,7 @@
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.ThreadStart = threadStartHandler;
eventCallbacks.ThreadEnd = threadEndHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -135,13 +135,13 @@
memset(&caps, 0, sizeof(caps));
caps.can_generate_vm_object_alloc_events = 1;
- if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
return JNI_ERR;
}
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.VMObjectAlloc = VMObjectAllocHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -113,13 +113,13 @@
memset(&caps, 0, sizeof(caps));
caps.can_redefine_classes = 1;
- if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
return JNI_ERR;
}
memset(&eventCallbacks,0, sizeof(eventCallbacks));
eventCallbacks.ClassLoad = classLoadHandler;
- if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/FieldAccess/fieldacc003/fieldacc003.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/FieldAccess/fieldacc003/fieldacc003.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -165,7 +165,7 @@
}
if (watch.m_sig == NULL ||
strcmp(watch.m_sig, watches[i].m_sig) != 0) {
- printf("(watch#%" PRIuPTR " ) wrong method sig: \"%s\"",
+ printf("(watch#%" PRIuPTR ") wrong method sig: \"%s\"",
i, watch.m_sig);
printf(", expected: \"%s\"\n", watches[i].m_sig);
result = STATUS_FAILED;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/ForceEarlyReturn001.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/ForceEarlyReturn001.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -44,10 +44,7 @@
, jobject earlyReturnThread
)
{
- if (!NSK_JVMTI_VERIFY(
- jvmti ->SuspendThread (earlyReturnThread )
- )
- )
+ if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(earlyReturnThread)))
return JNI_FALSE;
return JNI_TRUE;
@@ -62,10 +59,7 @@
, jobject earlyReturnThread
)
{
- if (!NSK_JVMTI_VERIFY(
- jvmti ->ResumeThread (earlyReturnThread )
- )
- )
+ if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(earlyReturnThread)))
return JNI_FALSE;
return JNI_TRUE;
@@ -81,10 +75,7 @@
, jobject valueToReturn
)
{
- if (!NSK_JVMTI_VERIFY(
- jvmti ->ForceEarlyReturnObject (earlyReturnThread , valueToReturn )
- )
- )
+ if (!NSK_JVMTI_VERIFY(jvmti->ForceEarlyReturnObject(earlyReturnThread, valueToReturn)))
return JNI_FALSE;
return JNI_TRUE;
@@ -100,10 +91,7 @@
, jint valueToReturn
)
{
- if (!NSK_JVMTI_VERIFY(
- jvmti ->ForceEarlyReturnInt (earlyReturnThread , valueToReturn )
- )
- )
+ if (!NSK_JVMTI_VERIFY(jvmti->ForceEarlyReturnInt(earlyReturnThread, valueToReturn)))
return JNI_FALSE;
return JNI_TRUE;
@@ -119,10 +107,7 @@
, jlong valueToReturn
)
{
- if (!NSK_JVMTI_VERIFY(
- jvmti ->ForceEarlyReturnLong (earlyReturnThread , valueToReturn )
- )
- )
+ if (!NSK_JVMTI_VERIFY(jvmti->ForceEarlyReturnLong(earlyReturnThread, valueToReturn)))
return JNI_FALSE;
return JNI_TRUE;
@@ -138,10 +123,7 @@
, jfloat valueToReturn
)
{
- if (!NSK_JVMTI_VERIFY(
- jvmti ->ForceEarlyReturnFloat (earlyReturnThread , valueToReturn )
- )
- )
+ if (!NSK_JVMTI_VERIFY(jvmti->ForceEarlyReturnFloat(earlyReturnThread, valueToReturn)))
return JNI_FALSE;
return JNI_TRUE;
@@ -157,10 +139,7 @@
, jdouble valueToReturn
)
{
- if (!NSK_JVMTI_VERIFY(
- jvmti ->ForceEarlyReturnDouble (earlyReturnThread , valueToReturn )
- )
- )
+ if (!NSK_JVMTI_VERIFY(jvmti->ForceEarlyReturnDouble(earlyReturnThread, valueToReturn)))
return JNI_FALSE;
return JNI_TRUE;
@@ -175,10 +154,7 @@
, jthread earlyReturnThread
)
{
- if (!NSK_JVMTI_VERIFY(
- jvmti ->ForceEarlyReturnVoid (earlyReturnThread )
- )
- )
+ if (!NSK_JVMTI_VERIFY(jvmti->ForceEarlyReturnVoid(earlyReturnThread)))
return JNI_FALSE;
return JNI_TRUE;
@@ -202,24 +178,17 @@
{
jvmtiCapabilities caps;
- if (!NSK_VERIFY(
- (jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL
- )
- )
+ if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL))
return JNI_ERR;
- if (!NSK_JVMTI_VERIFY(jvmti ->GetCapabilities (&caps)
- )
- )
+ if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
return JNI_ERR;
// Register all necessary JVM capabilities
caps.can_force_early_return = 1;
caps.can_suspend = 1;
- if (!NSK_JVMTI_VERIFY(jvmti ->AddCapabilities (&caps)
- )
- )
+ if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
return JNI_ERR;
return JNI_OK;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat002/thrstat002.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat002/thrstat002.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -245,8 +245,8 @@
return;
}
- printf( "START checkStatus for \"thr1\" (0x%p%s), check state: %s\n",
- thr_ptr, suspStr, TranslateState(state[statInd]) );
+ printf("START checkStatus for \"thr1\" (0x%p%s), check state: %s\n",
+ thr_ptr, suspStr, TranslateState(state[statInd]));
timeout_is_reached = JNI_TRUE;
for (millis = WAIT_START, waited_millis=0; millis < wait_time; millis <<= 1) {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat005/thrstat005.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat005/thrstat005.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -101,13 +101,13 @@
jint res;
res = jvm->GetEnv((void **) &g_ppJvmtiEnv, JVMTI_VERSION_1_1);
- if ( res != JNI_OK || ! g_ppJvmtiEnv ) {
+ if (res != JNI_OK || !g_ppJvmtiEnv) {
printf("Agent_OnLoad: Error: GetEnv returned error or NULL\n");
return JNI_ERR;
}
error = g_ppJvmtiEnv->CreateRawMonitor("beast", &g_waitMon);
- if ( error != JVMTI_ERROR_NONE ) {
+ if (error != JVMTI_ERROR_NONE) {
reportError("Agent_OnLoad: error creating raw monitor", error);
return JNI_ERR;
}
@@ -139,21 +139,21 @@
printf("GetThreadState = %x. Masked: %x. Must be: %x\n", thrState, maskedThrState, g_ThreadState[stateIdx]);
fflush(stdout);
- if ( maskedThrState == g_ThreadState[stateIdx] )
+ if (maskedThrState == g_ThreadState[stateIdx])
return JNI_TRUE;
printf("checkThreadState: wait %d ms\n", waitTime);
fflush(stdout);
- if ( (res = g_ppJvmtiEnv->RawMonitorEnter(g_waitMon)) != JVMTI_ERROR_NONE
+ if ((res = g_ppJvmtiEnv->RawMonitorEnter(g_waitMon)) != JVMTI_ERROR_NONE
|| (res = g_ppJvmtiEnv->RawMonitorWait(g_waitMon, waitTime)) != JVMTI_ERROR_NONE
- || (res = g_ppJvmtiEnv->RawMonitorExit(g_waitMon)) != JVMTI_ERROR_NONE ) {
+ || (res = g_ppJvmtiEnv->RawMonitorExit(g_waitMon)) != JVMTI_ERROR_NONE) {
reportError("GetThreadState: unexpected error", res);
return JNI_FALSE;
}
waitTime <<= 1;
- } while ( waitTime < g_waitTime );
+ } while (waitTime < g_waitTime);
return JNI_FALSE;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -86,7 +86,7 @@
long ind = (long)((*tag_ptr) - 1);
- if (ind < 0 || ind > objectDescCount ) {
+ if (ind < 0 || ind > objectDescCount) {
NSK_COMPLAIN1("heapObjectCallbackForSecondIteration: invalid object tag value: %d\n", (long)*tag_ptr);
nsk_jvmti_setFailStatus();
callbackAborted = 1;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap006/iterheap006.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap006/iterheap006.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -46,7 +46,7 @@
void* storage_data) {
if (!NSK_JVMTI_VERIFY(
- st_jvmti->SetEnvironmentLocalStorage(storage_data ))) {
+ st_jvmti->SetEnvironmentLocalStorage(storage_data))) {
nsk_jvmti_setFailStatus();
}
@@ -86,7 +86,7 @@
if (strcmp(storage_data, (char *)storage_ptr) != 0) {
NSK_COMPLAIN2("Local storage was corrupted: %s ,\n\texpected value: %s\n",
- (char *)storage_ptr, storage_data );
+ (char *)storage_ptr, storage_data);
nsk_jvmti_setFailStatus();
}
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap007/iterheap007.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap007/iterheap007.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -45,8 +45,7 @@
jlong* tag_ptr,
void* user_data) {
- if (!NSK_JVMTI_VERIFY(
- st_jvmti->GetCurrentThreadCpuTimerInfo(&timer_info1 ))) {
+ if (!NSK_JVMTI_VERIFY(st_jvmti->GetCurrentThreadCpuTimerInfo(&timer_info1))) {
nsk_jvmti_setFailStatus();
}
/* Check the returned jvmtiTimerInfo structure */
@@ -64,14 +63,12 @@
}
/* ---------------------------------------------------------------------- */
- if (!NSK_JVMTI_VERIFY(
- st_jvmti->GetCurrentThreadCpuTime(&nanos ))) {
+ if (!NSK_JVMTI_VERIFY(st_jvmti->GetCurrentThreadCpuTime(&nanos))) {
nsk_jvmti_setFailStatus();
}
/* ---------------------------------------------------------------------- */
- if (!NSK_JVMTI_VERIFY(
- st_jvmti->GetTimerInfo(&timer_info2 ))) {
+ if (!NSK_JVMTI_VERIFY(st_jvmti->GetTimerInfo(&timer_info2))) {
nsk_jvmti_setFailStatus();
}
/* Check the returned jvmtiTimerInfo structure */
@@ -90,8 +87,7 @@
/* ---------------------------------------------------------------------- */
nanos = 0;
- if (!NSK_JVMTI_VERIFY(
- st_jvmti->GetTime(&nanos ))) {
+ if (!NSK_JVMTI_VERIFY(st_jvmti->GetTime(&nanos))) {
nsk_jvmti_setFailStatus();
}
@@ -112,8 +108,8 @@
{
NSK_DISPLAY0("Calling IterateOverHeap with filter JVMTI_HEAP_OBJECT_EITHER\n");
{
- if (!NSK_JVMTI_VERIFY(
- jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_EITHER, heapObjectCallback, (void *)user_data))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->IterateOverHeap(
+ JVMTI_HEAP_OBJECT_EITHER, heapObjectCallback, (void *)user_data))) {
nsk_jvmti_setFailStatus();
}
}
@@ -159,8 +155,7 @@
caps.can_tag_objects = 1;
caps.can_get_current_thread_cpu_time = 1;
- if (!NSK_JVMTI_VERIFY(
- jvmti->AddCapabilities(&caps))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
return JNI_ERR;
}
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls006/iterinstcls006.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls006/iterinstcls006.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -90,13 +90,13 @@
if (storage_data != storage_ptr) {
NSK_COMPLAIN2("Local storage address was corrupted: %p ,\n\texpected value: %p\n",
- storage_ptr, storage_data);
+ storage_ptr, storage_data);
nsk_jvmti_setFailStatus();
}
if (strcmp(storage_data, (char *)storage_ptr) != 0) {
NSK_COMPLAIN2("Local storage was corrupted: %s ,\n\texpected value: %s\n",
- (char *)storage_ptr, storage_data );
+ (char *)storage_ptr, storage_data);
nsk_jvmti_setFailStatus();
}
} while (0);
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj002/iterobjreachobj002.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj002/iterobjreachobj002.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -54,13 +54,13 @@
/** jvmtiObjectReferenceCallback for first iteration. */
jvmtiIterationControl JNICALL
-objectReferenceCallback1( jvmtiObjectReferenceKind reference_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong referrer_tag,
- jint referrer_index,
- void* user_data) {
+objectReferenceCallback1(jvmtiObjectReferenceKind reference_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong referrer_tag,
+ jint referrer_index,
+ void* user_data) {
objectCount++;
/* Set tag */
@@ -80,13 +80,13 @@
/** jvmtiObjectReferenceCallback for second iteration. */
jvmtiIterationControl JNICALL
-objectReferenceCallback2( jvmtiObjectReferenceKind reference_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong referrer_tag,
- jint referrer_index,
- void* user_data) {
+objectReferenceCallback2(jvmtiObjectReferenceKind reference_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong referrer_tag,
+ jint referrer_index,
+ void* user_data) {
objectCount--;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj003/iterobjreachobj003.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj003/iterobjreachobj003.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -40,13 +40,13 @@
/* ============================================================================= */
jvmtiIterationControl JNICALL
-objectReferenceCallback( jvmtiObjectReferenceKind reference_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong referrer_tag,
- jint referrer_index,
- void* user_data) {
+objectReferenceCallback(jvmtiObjectReferenceKind reference_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong referrer_tag,
+ jint referrer_index,
+ void* user_data) {
const char* name = "monitorName";
jrawMonitorID monitor_ptr = NULL;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj004/iterobjreachobj004.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj004/iterobjreachobj004.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -42,13 +42,13 @@
/* ============================================================================= */
jvmtiIterationControl JNICALL
-objectReferenceCallback( jvmtiObjectReferenceKind reference_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong referrer_tag,
- jint referrer_index,
- void* user_data) {
+objectReferenceCallback(jvmtiObjectReferenceKind reference_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong referrer_tag,
+ jint referrer_index,
+ void* user_data) {
objCounter++;
@@ -115,13 +115,13 @@
if (storage_data != storage_ptr) {
NSK_COMPLAIN2("Local storage address was corrupted: %p ,\n\texpected value: %p\n",
- storage_ptr, storage_data);
+ storage_ptr, storage_data);
nsk_jvmti_setFailStatus();
}
if (strcmp(storage_data, (char *)storage_ptr) != 0) {
NSK_COMPLAIN2("Local storage was corrupted: %s ,\n\texpected value: %s\n",
- (char *)storage_ptr, storage_data );
+ (char *)storage_ptr, storage_data);
nsk_jvmti_setFailStatus();
}
} while (0);
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj005/iterobjreachobj005.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj005/iterobjreachobj005.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -42,13 +42,13 @@
/* ============================================================================= */
jvmtiIterationControl JNICALL
-objectReferenceCallback( jvmtiObjectReferenceKind reference_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong referrer_tag,
- jint referrer_index,
- void* user_data) {
+objectReferenceCallback(jvmtiObjectReferenceKind reference_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong referrer_tag,
+ jint referrer_index,
+ void* user_data) {
objCounter++;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj002/iterreachobj002.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj002/iterreachobj002.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -64,11 +64,11 @@
/** jvmtiHeapRootCallback for first iteration. */
jvmtiIterationControl JNICALL
-heapRootCallbackForFirstObjectsIteration( jvmtiHeapRootKind root_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- void* user_data) {
+heapRootCallbackForFirstObjectsIteration(jvmtiHeapRootKind root_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ void* user_data) {
if (*tag_ptr != 0) return JVMTI_ITERATION_CONTINUE;
@@ -94,11 +94,11 @@
/** jvmtiHeapRootCallback for second iteration. */
jvmtiIterationControl JNICALL
-heapRootCallbackForSecondObjectsIteration( jvmtiHeapRootKind root_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- void* user_data) {
+heapRootCallbackForSecondObjectsIteration(jvmtiHeapRootKind root_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ void* user_data) {
long ind = (long)((*tag_ptr) - 1);
@@ -108,7 +108,7 @@
ObjectDesc *objectDesc = objectDescArr[ind];
jlong tag = (*objectDesc).tag;
*/
- if (ind < 0 || ind > objectCountMax ) {
+ if (ind < 0 || ind > objectCountMax) {
NSK_COMPLAIN1("heapRootCallbackForSecondObjectsIteration: invalid object tag value: %d\n", (long)*tag_ptr);
nsk_jvmti_setFailStatus();
callbackAborted = 1;
@@ -138,15 +138,15 @@
/** jvmtiStackReferenceCallback for first iteration. */
jvmtiIterationControl JNICALL
-stackReferenceCallbackForFirstObjectsIteration( jvmtiHeapRootKind root_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong thread_tag,
- jint depth,
- jmethodID method,
- jint slot,
- void* user_data) {
+stackReferenceCallbackForFirstObjectsIteration(jvmtiHeapRootKind root_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong thread_tag,
+ jint depth,
+ jmethodID method,
+ jint slot,
+ void* user_data) {
if (*tag_ptr != 0) return JVMTI_ITERATION_CONTINUE;
@@ -172,15 +172,15 @@
/** jvmtiStackReferenceCallback for second iteration. */
jvmtiIterationControl JNICALL
-stackReferenceCallbackForSecondObjectsIteration( jvmtiHeapRootKind root_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong thread_tag,
- jint depth,
- jmethodID method,
- jint slot,
- void* user_data) {
+stackReferenceCallbackForSecondObjectsIteration(jvmtiHeapRootKind root_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong thread_tag,
+ jint depth,
+ jmethodID method,
+ jint slot,
+ void* user_data) {
long ind = (long)((*tag_ptr) - 1);
@@ -190,7 +190,7 @@
ObjectDesc *objectDesc = objectDescArr[ind];
jlong tag = (*objectDesc).tag;
*/
- if (ind < 0 || ind > objectCountMax ) {
+ if (ind < 0 || ind > objectCountMax) {
NSK_COMPLAIN1("stackReferenceCallbackForSecondObjectsIteration: invalid object tag value: %d\n", (long)*tag_ptr);
nsk_jvmti_setFailStatus();
callbackAborted = 1;
@@ -220,13 +220,13 @@
/** jvmtiObjectReferenceCallback for first iteration. */
jvmtiIterationControl JNICALL
-objectReferenceCallbackForFirstObjectsIteration( jvmtiObjectReferenceKind reference_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong referrer_tag,
- jint referrer_index,
- void* user_data) {
+objectReferenceCallbackForFirstObjectsIteration(jvmtiObjectReferenceKind reference_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong referrer_tag,
+ jint referrer_index,
+ void* user_data) {
if (*tag_ptr != 0) return JVMTI_ITERATION_CONTINUE;
@@ -252,13 +252,13 @@
/** jvmtiObjectReferenceCallback for second iteration. */
jvmtiIterationControl JNICALL
-objectReferenceCallbackForSecondObjectsIteration( jvmtiObjectReferenceKind reference_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong referrer_tag,
- jint referrer_index,
- void* user_data) {
+objectReferenceCallbackForSecondObjectsIteration(jvmtiObjectReferenceKind reference_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong referrer_tag,
+ jint referrer_index,
+ void* user_data) {
long ind = (long)((*tag_ptr) - 1);
@@ -268,7 +268,7 @@
ObjectDesc *objectDesc = objectDescArr[ind];
jlong tag = (*objectDesc).tag;
*/
- if (ind < 0 || ind > objectCountMax ) {
+ if (ind < 0 || ind > objectCountMax) {
NSK_COMPLAIN1("objectReferenceCallbackForSecondObjectsIteration: invalid object tag value: %d\n", (long)*tag_ptr);
nsk_jvmti_setFailStatus();
callbackAborted = 1;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj003/iterreachobj003.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj003/iterreachobj003.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -44,11 +44,11 @@
/* jvmtiHeapRootCallback */
jvmtiIterationControl JNICALL
-heapRootCallback( jvmtiHeapRootKind root_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- void* user_data) {
+heapRootCallback(jvmtiHeapRootKind root_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ void* user_data) {
jrawMonitorID monitor_ptr = NULL;
@@ -104,15 +104,15 @@
/* jvmtiStackReferenceCallback */
jvmtiIterationControl JNICALL
-stackReferenceCallback( jvmtiHeapRootKind root_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong thread_tag,
- jint depth,
- jmethodID method,
- jint slot,
- void* user_data) {
+stackReferenceCallback(jvmtiHeapRootKind root_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong thread_tag,
+ jint depth,
+ jmethodID method,
+ jint slot,
+ void* user_data) {
jrawMonitorID monitor_ptr = NULL;
@@ -169,13 +169,13 @@
/* jvmtiObjectReferenceCallback */
jvmtiIterationControl JNICALL
-objectReferenceCallback( jvmtiObjectReferenceKind reference_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong referrer_tag,
- jint referrer_index,
- void* user_data) {
+objectReferenceCallback(jvmtiObjectReferenceKind reference_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong referrer_tag,
+ jint referrer_index,
+ void* user_data) {
jrawMonitorID monitor_ptr = NULL;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj004/iterreachobj004.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj004/iterreachobj004.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -46,11 +46,11 @@
/* jvmtiHeapRootCallback */
jvmtiIterationControl JNICALL
-heapRootCallback( jvmtiHeapRootKind root_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- void* user_data) {
+heapRootCallback(jvmtiHeapRootKind root_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ void* user_data) {
*tag_ptr = (jlong)++objCounter;
@@ -66,14 +66,14 @@
if (storage_data != storage_ptr) {
NSK_COMPLAIN2("heapRootCallback: Local storage address was corrupted: %p ,\n\texpected value: %p\n",
- storage_ptr, storage_data);
+ storage_ptr, storage_data);
nsk_jvmti_setFailStatus();
return JVMTI_ITERATION_ABORT;
}
if (strcmp(storage_data, (char *)storage_ptr) != 0) {
NSK_COMPLAIN2("heapRootCallback: Local storage was corrupted: %s ,\n\texpected value: %s\n",
- (char *)storage_ptr, storage_data );
+ (char *)storage_ptr, storage_data);
nsk_jvmti_setFailStatus();
return JVMTI_ITERATION_ABORT;
}
@@ -86,15 +86,15 @@
/* jvmtiStackReferenceCallback */
jvmtiIterationControl JNICALL
-stackReferenceCallback( jvmtiHeapRootKind root_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong thread_tag,
- jint depth,
- jmethodID method,
- jint slot,
- void* user_data) {
+stackReferenceCallback(jvmtiHeapRootKind root_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong thread_tag,
+ jint depth,
+ jmethodID method,
+ jint slot,
+ void* user_data) {
*tag_ptr = (jlong)++objCounter;
@@ -110,14 +110,14 @@
if (storage_data != storage_ptr) {
NSK_COMPLAIN2("stackReferenceCallback: Local storage address was corrupted: %p ,\n\texpected value: %p\n",
- storage_ptr, storage_data);
+ storage_ptr, storage_data);
nsk_jvmti_setFailStatus();
return JVMTI_ITERATION_ABORT;
}
if (strcmp(storage_data, (char *)storage_ptr) != 0) {
NSK_COMPLAIN2("stackReferenceCallback: Local storage was corrupted: %s ,\n\texpected value: %s\n",
- (char *)storage_ptr, storage_data );
+ (char *)storage_ptr, storage_data);
nsk_jvmti_setFailStatus();
return JVMTI_ITERATION_ABORT;
}
@@ -131,13 +131,13 @@
/* jvmtiObjectReferenceCallback */
jvmtiIterationControl JNICALL
-objectReferenceCallback( jvmtiObjectReferenceKind reference_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong referrer_tag,
- jint referrer_index,
- void* user_data) {
+objectReferenceCallback(jvmtiObjectReferenceKind reference_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong referrer_tag,
+ jint referrer_index,
+ void* user_data) {
*tag_ptr = (jlong)++objCounter;
@@ -153,14 +153,14 @@
if (storage_data != storage_ptr) {
NSK_COMPLAIN2("objectReferenceCallback: Local storage address was corrupted: %p ,\n\texpected value: %p\n",
- storage_ptr, storage_data);
+ storage_ptr, storage_data);
nsk_jvmti_setFailStatus();
return JVMTI_ITERATION_ABORT;
}
if (strcmp(storage_data, (char *)storage_ptr) != 0) {
NSK_COMPLAIN2("objectReferenceCallback: Local storage was corrupted: %s ,\n\texpected value: %s\n",
- (char *)storage_ptr, storage_data );
+ (char *)storage_ptr, storage_data);
nsk_jvmti_setFailStatus();
return JVMTI_ITERATION_ABORT;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj005/iterreachobj005.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj005/iterreachobj005.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -43,11 +43,11 @@
/* jvmtiHeapRootCallback */
jvmtiIterationControl JNICALL
-heapRootCallback( jvmtiHeapRootKind root_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- void* user_data) {
+heapRootCallback(jvmtiHeapRootKind root_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ void* user_data) {
*tag_ptr = (jlong)++objCounter;
@@ -108,15 +108,15 @@
/* jvmtiStackReferenceCallback */
jvmtiIterationControl JNICALL
-stackReferenceCallback( jvmtiHeapRootKind root_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong thread_tag,
- jint depth,
- jmethodID method,
- jint slot,
- void* user_data) {
+stackReferenceCallback(jvmtiHeapRootKind root_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong thread_tag,
+ jint depth,
+ jmethodID method,
+ jint slot,
+ void* user_data) {
*tag_ptr = (jlong)++objCounter;
@@ -178,13 +178,13 @@
/* jvmtiObjectReferenceCallback */
jvmtiIterationControl JNICALL
-objectReferenceCallback( jvmtiObjectReferenceKind reference_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong referrer_tag,
- jint referrer_index,
- void* user_data) {
+objectReferenceCallback(jvmtiObjectReferenceKind reference_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong referrer_tag,
+ jint referrer_index,
+ void* user_data) {
*tag_ptr = (jlong)++objCounter;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -77,26 +77,26 @@
jvmtiEventCallbacks callbacks;
jvmtiCapabilities capabilities;
- if ( ! NSK_VERIFY(nsk_jvmti_parseOptions(options)))
+ if (!NSK_VERIFY(nsk_jvmti_parseOptions(options)))
return JNI_ERR;
- if ( ! NSK_VERIFY((gJvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL) )
+ if (!NSK_VERIFY((gJvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL))
return JNI_ERR;
memset(&capabilities, 0, sizeof(jvmtiCapabilities));
capabilities.can_generate_resource_exhaustion_heap_events = 1;
capabilities.can_generate_resource_exhaustion_threads_events = 1;
- if ( ! NSK_JVMTI_VERIFY(gJvmti->AddCapabilities(&capabilities)) )
+ if (!NSK_JVMTI_VERIFY(gJvmti->AddCapabilities(&capabilities)))
return JNI_ERR;
memset((void *)&callbacks, 0, sizeof(jvmtiEventCallbacks));
callbacks.ResourceExhausted = resourceExhausted;
- if ( ! NSK_JVMTI_VERIFY(gJvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))) )
+ if (!NSK_JVMTI_VERIFY(gJvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
return JNI_ERR;
- if ( ! NSK_JVMTI_VERIFY(gJvmti->SetEventNotificationMode(JVMTI_ENABLE,
- JVMTI_EVENT_RESOURCE_EXHAUSTED,
- NULL) ) )
+ if (!NSK_JVMTI_VERIFY(gJvmti->SetEventNotificationMode(JVMTI_ENABLE,
+ JVMTI_EVENT_RESOURCE_EXHAUSTED,
+ NULL)))
return JNI_ERR;
return JNI_OK;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst002/resumethrdlst002.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst002/resumethrdlst002.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -250,7 +250,7 @@
int i = 0;
jvmtiError e = jvmti->RawMonitorEnter(eventsReceivedMtx);
- if ( !NSK_JVMTI_VERIFY(e) ) {
+ if (!NSK_JVMTI_VERIFY(e)) {
NSK_DISPLAY1(" ... ERROR entering raw monitor for thread %p\n", (void *) thread);
return;
}
@@ -323,7 +323,7 @@
/* create a mutex for the eventsReceived variable */
{
- if ( ! NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("eventsReceived", &eventsReceivedMtx))) {
+ if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("eventsReceived", &eventsReceivedMtx))) {
return JNI_ERR;
}
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetExtensionEventCallback/setextevent001/setextevent001.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetExtensionEventCallback/setextevent001/setextevent001.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -36,7 +36,7 @@
/* ============================================================================= */
static void JNICALL
-callbackExtensionEvent(jvmtiEnv* jvmti, ... ) {
+callbackExtensionEvent(jvmtiEnv* jvmti, ...) {
NSK_DISPLAY0(" event: callbackExtensionEvent\n");
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal001/setlocal001.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal001/setlocal001.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -258,7 +258,7 @@
jvmtiError err;
res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1);
- if ( res != JNI_OK || jvmti == NULL ) {
+ if (res != JNI_OK || jvmti == NULL) {
printf("Wrong result of a valid call to GetEnv !\n");
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ThreadStart/threadstart002/threadstart002.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ThreadStart/threadstart002/threadstart002.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -145,7 +145,7 @@
while (terminate_debug_agent != JNI_TRUE) {
- if (next_thread == NULL ) {
+ if (next_thread == NULL) {
/* wait till new thread will be created and started */
if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorWait(thr_start_lock, (jlong)0))) {
result = STATUS_FAILED;
@@ -318,7 +318,7 @@
}
/* Wait till this started thread will be resumed by agent thread */
- if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorWait(thr_resume_lock, (jlong)WAIT_TIME ))) {
+ if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorWait(thr_resume_lock, (jlong)WAIT_TIME))) {
NSK_COMPLAIN1("[ThreadStart hook] thread#%d failed while waiting for thr_resume_lock\n", eventsCount);
result = STATUS_FAILED;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP01/ap01t001/ap01t001.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP01/ap01t001/ap01t001.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -63,7 +63,7 @@
NSK_DISPLAY0("VMDeath event received\n");
- if (obj_free != (EXP_OBJ_NUMBER - 1) ) {
+ if (obj_free != (EXP_OBJ_NUMBER - 1)) {
NSK_COMPLAIN2(
"Received unexpected number of ObjectFree events: %d\n"
"\texpected number: %d\n",
@@ -88,15 +88,15 @@
}
jvmtiIterationControl JNICALL
-stackReferenceCallback( jvmtiHeapRootKind root_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong thread_tag,
- jint depth,
- jmethodID method,
- jint slot,
- void* user_data) {
+stackReferenceCallback(jvmtiHeapRootKind root_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong thread_tag,
+ jint depth,
+ jmethodID method,
+ jint slot,
+ void* user_data) {
if (class_tag == DEBUGEE_CLASS_TAG && *tag_ptr == 0) {
obj_count++;
@@ -107,11 +107,11 @@
}
jvmtiIterationControl JNICALL
-heapRootCallback( jvmtiHeapRootKind root_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- void* user_data) {
+heapRootCallback(jvmtiHeapRootKind root_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ void* user_data) {
if (class_tag == DEBUGEE_CLASS_TAG && *tag_ptr == 0) {
obj_count++;
@@ -122,13 +122,13 @@
}
jvmtiIterationControl JNICALL
-objectReferenceCallback( jvmtiObjectReferenceKind reference_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong referrer_tag,
- jint referrer_index,
- void* user_data) {
+objectReferenceCallback(jvmtiObjectReferenceKind reference_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong referrer_tag,
+ jint referrer_index,
+ void* user_data) {
if (class_tag == DEBUGEE_CLASS_TAG && *tag_ptr == 0) {
obj_count++;
@@ -142,17 +142,17 @@
/************************/
JNIEXPORT jobject JNICALL
-Java_nsk_jvmti_scenarios_allocation_AP01_ap01t001_newObject( JNIEnv* jni, jclass cls ) {
+Java_nsk_jvmti_scenarios_allocation_AP01_ap01t001_newObject(JNIEnv* jni, jclass cls) {
jmethodID cid;
jobject result;
- if (!NSK_JNI_VERIFY(jni, (cid = jni->GetMethodID(cls, "<init>", "()V" )) != NULL)) {
+ if (!NSK_JNI_VERIFY(jni, (cid = jni->GetMethodID(cls, "<init>", "()V")) != NULL)) {
NSK_COMPLAIN0("newObject: GetMethodID returned NULL\n\n");
nsk_jvmti_setFailStatus();
return NULL;
}
- if (!NSK_JNI_VERIFY(jni, ( result = jni->NewObject(cls, cid)) != NULL)) {
+ if (!NSK_JNI_VERIFY(jni, (result = jni->NewObject(cls, cid)) != NULL)) {
NSK_COMPLAIN0("newObject: NewObject returned NULL\n\n");
nsk_jvmti_setFailStatus();
@@ -163,18 +163,18 @@
}
JNIEXPORT jobject JNICALL
-Java_nsk_jvmti_scenarios_allocation_AP01_ap01t001_allocObject( JNIEnv* jni, jclass cls ) {
+Java_nsk_jvmti_scenarios_allocation_AP01_ap01t001_allocObject(JNIEnv* jni, jclass cls) {
jmethodID cid;
jobject result;
- if (!NSK_JNI_VERIFY(jni, ( cid = jni->GetMethodID(cls, "<init>", "()V" )) != NULL)) {
+ if (!NSK_JNI_VERIFY(jni, (cid = jni->GetMethodID(cls, "<init>", "()V")) != NULL)) {
NSK_COMPLAIN0("allocObject: GetMethodID returned NULL\n\n");
nsk_jvmti_setFailStatus();
return NULL;
}
- if (!NSK_JNI_VERIFY(jni, ( result = jni->AllocObject(cls)) != NULL)) {
+ if (!NSK_JNI_VERIFY(jni, (result = jni->AllocObject(cls)) != NULL)) {
NSK_COMPLAIN0("allocObject: AllocObject returned NULL\n\n");
nsk_jvmti_setFailStatus();
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP02/ap02t001/ap02t001.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP02/ap02t001/ap02t001.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -66,15 +66,15 @@
}
jvmtiIterationControl JNICALL
-stackReferenceCallback( jvmtiHeapRootKind root_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong thread_tag,
- jint depth,
- jmethodID method,
- jint slot,
- void* user_data) {
+stackReferenceCallback(jvmtiHeapRootKind root_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong thread_tag,
+ jint depth,
+ jmethodID method,
+ jint slot,
+ void* user_data) {
if (class_tag == TESTED_CLASS_TAG) {
obj_count++;
@@ -86,14 +86,14 @@
/************************/
JNIEXPORT void JNICALL
-Java_nsk_jvmti_scenarios_allocation_AP02_ap02t001_throwException( JNIEnv* jni,
- jclass cls,
- jclass exception_cls ) {
+Java_nsk_jvmti_scenarios_allocation_AP02_ap02t001_throwException(JNIEnv* jni,
+ jclass cls,
+ jclass exception_cls) {
jint result;
- result = jni->ThrowNew(exception_cls, "Got expected exception thrown from native code" );
+ result = jni->ThrowNew(exception_cls, "Got expected exception thrown from native code");
if (result != 0) {
- NSK_COMPLAIN1("throwException: Unable to throw exception in native code: %d\n\n", result );
+ NSK_COMPLAIN1("throwException: Unable to throw exception in native code: %d\n\n", result);
nsk_jvmti_setFailStatus();
} else {
NSK_DISPLAY0("throwException: ThrowNew returned success code: 0\n\n");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP03/ap03t001/ap03t001.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP03/ap03t001/ap03t001.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -69,13 +69,13 @@
}
jvmtiIterationControl JNICALL
-objectReferenceCallback( jvmtiObjectReferenceKind reference_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong referrer_tag,
- jint referrer_index,
- void* user_data) {
+objectReferenceCallback(jvmtiObjectReferenceKind reference_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong referrer_tag,
+ jint referrer_index,
+ void* user_data) {
if (class_tag == DEBUGEE_CLASS_TAG && *tag_ptr != 0) {
obj_count++;
@@ -88,7 +88,7 @@
/************************/
JNIEXPORT void JNICALL
-Java_nsk_jvmti_scenarios_allocation_AP03_ap03t001_setTag( JNIEnv* jni, jobject obj, jlong tag) {
+Java_nsk_jvmti_scenarios_allocation_AP03_ap03t001_setTag(JNIEnv* jni, jobject obj, jlong tag) {
if (!NSK_JVMTI_VERIFY(jvmti->SetTag(obj, tag))) {
nsk_jvmti_setFailStatus();
@@ -160,13 +160,13 @@
}
if (!NSK_JNI_VERIFY(jni, (fid =
- jni->GetStaticFieldID(debugeeClass, "catcher", DEBUGEE_SIGNATURE)) != NULL )) {
+ jni->GetStaticFieldID(debugeeClass, "catcher", DEBUGEE_SIGNATURE)) != NULL)) {
nsk_jvmti_setFailStatus();
break;
}
if (!NSK_JNI_VERIFY(jni, (catcher =
- jni->GetStaticObjectField(debugeeClass, fid)) != NULL )) {
+ jni->GetStaticObjectField(debugeeClass, fid)) != NULL)) {
NSK_COMPLAIN0("GetStaticObjectField returned NULL for 'catcher' field value\n\n");
nsk_jvmti_setFailStatus();
break;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t001/ap04t001.cpp Mon Oct 22 17:00:04 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t001/ap04t001.cpp Mon Oct 22 19:31:41 2018 -0700
@@ -109,10 +109,10 @@
/***********************************************************************/
jvmtiIterationControl JNICALL
-heapObjectCallback( jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- void* user_data) {
+heapObjectCallback(jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ void* user_data) {
int count = 0;
@@ -133,11 +133,11 @@
/* jvmtiHeapRootCallback */
jvmtiIterationControl JNICALL
-heapRootCallback( jvmtiHeapRootKind root_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- void* user_data) {
+heapRootCallback(jvmtiHeapRootKind root_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ void* user_data) {
int count = 0;
@@ -158,15 +158,15 @@
/* jvmtiStackReferenceCallback */
jvmtiIterationControl JNICALL
-stackReferenceCallback( jvmtiHeapRootKind root_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong thread_tag,
- jint depth,
- jmethodID method,
- jint slot,
- void* user_data) {
+stackReferenceCallback(jvmtiHeapRootKind root_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong thread_tag,
+ jint depth,
+ jmethodID method,
+ jint slot,
+ void* user_data) {
int count = 0;
@@ -188,13 +188,13 @@
/* jvmtiObjectReferenceCallback */
jvmtiIterationControl JNICALL
-objectReferenceCallback( jvmtiObjectReferenceKind reference_kind,
- jlong class_tag,
- jlong size,
- jlong* tag_ptr,
- jlong referrer_tag,
- jint referrer_index,
- void* user_data) {
+objectReferenceCallback(jvmtiObjectReferenceKind reference_kind,
+ jlong class_tag,
+ jlong size,
+ jlong* tag_ptr,
+ jlong referrer_tag,
+ jint referrer_index,
+ void* user_data) {
int count = 0;
@@ -237,10 +237,10 @@
/***********************************************************************/
JNIEXPORT void JNICALL
-Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_setTag( JNIEnv* jni,
- jclass klass,
- jobject target, /* object to be tagged */
- jlong tag ) {
+Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_setTag(JNIEnv* jni,
+ jclass klass,
+ jobject target, /* object to be tagged */
+ jlong tag) {
if (!NSK_JVMTI_VERIFY(jvmti->SetTag(target, tag))) {
nsk_jvmti_setFailStatus();
@@ -248,7 +248,7 @@
}
JNIEXPORT void JNICALL
-Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_forceGC( JNIEnv* jni,
+Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_forceGC(JNIEnv* jni,
jclass klass) {
NSK_DISPLAY0(" run: ForceGarbageCollection\n");
@@ -258,8 +258,8 @@
}
JNIEXPORT void JNICALL
-Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_runIterateOverHeap( JNIEnv* jni,
- jclass klass ) {
+Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_runIterateOverHeap(JNIEnv* jni,
+ jclass klass) {
int count = 0;
setCounter(&errorCount, 0);
@@ -286,8 +286,8 @@
}
JNIEXPORT void JNICALL
-Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_runIterateOverReachableObjects( JNIEnv* jni,
- jclass klass ) {
+Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_runIterateOverReachableObjects(JNIEnv* jni,
+ jclass klass) {
int count = 0;
setCounter(&errorCount, 0);
@@ -315,8 +315,8 @@
}
JNIEXPORT void JNICALL
-Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_runIterateOverInstancesOfClass( JNIEnv* jni,
- jclass klass ) {
+Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_runIterateOverInstancesOfClass(JNIEnv* jni,
+ jclass klass) {
int count = 0;
setCounter(&errorCount, 0);
@@ -344,14 +344,14 @@
}
JNIEXPORT void JNICALL
-Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_runIterateOverObjectsReachableFromObject( JNIEnv* jni,
- jclass klass ) {
+Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_runIterateOverObjectsReachableFromObject(JNIEnv* jni,
+ jclass klass) {
jobject root = NULL;
int count = 0;
if (!NSK_JNI_VERIFY(jni, (root =
- jni->GetStaticObjectField(debugeeClass, rootFieldID)) != NULL )) {
+ jni->GetStaticObjectField(debugeeClass, rootFieldID)) != NULL)) {
NSK_COMPLAIN0("GetStaticObjectField returned NULL for 'root' field value\n\n");
nsk_jvmti_setFailStatus();
return;
@@ -402,14 +402,14 @@
NSK_DISPLAY1("Find ID of 'root' field: %s\n", ROOT_SIGNATURE);
if (!NSK_JNI_VERIFY(jni, (rootFieldID =
- jni->GetStaticFieldID(debugeeClass, "root", ROOT_SIGNATURE)) != NULL )) {
+ jni->GetStaticFieldID(debugeeClass, "root", ROOT_SIGNATURE)) != NULL)) {
nsk_jvmti_setFailStatus();
return;
}
NSK_DISPLAY1("Find ID of 'unlockSecondary' method: %s\n", ROOT_SIGNATURE);
if (!NSK_JNI_VERIFY(jni, (unlockSecondaryID =
- jni->GetStaticMethodID(debugeeClass, "unlockSecondary", "()V")) != NULL )) {
+ jni->GetStaticMethodID(debugeeClass, "unlockSecondary", "()V")) != NULL)) {
nsk_jvmti_setFailStatus();
return;
}