8214502: Add space after/before {} in remaining vmTestbase tests
Summary: Added spaces around the {}
Reviewed-by: dholmes, sspitsyn
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Exception/exception001/exception001.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Exception/exception001/exception001.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -63,15 +63,15 @@
static jint result = PASSED;
static jboolean printdump = JNI_FALSE;
static exceptionInfo exs[] = {
- {"Lnsk/jvmti/Exception/exception001c;",
- "Lnsk/jvmti/Exception/exception001b;", "meth1", "()V", 7,
- "Lnsk/jvmti/Exception/exception001a;", "run", "()V", 14},
- {"Ljava/lang/ArithmeticException;",
- "Lnsk/jvmti/Exception/exception001b;", "meth2", "(I)I", 3,
- "Lnsk/jvmti/Exception/exception001a;", "run", "()V", 24},
- {"Ljava/lang/ArrayIndexOutOfBoundsException;",
- "Lnsk/jvmti/Exception/exception001b;", "meth3", "(I)I", 10,
- "Lnsk/jvmti/Exception/exception001a;", "run", "()V", 34}
+ { "Lnsk/jvmti/Exception/exception001c;",
+ "Lnsk/jvmti/Exception/exception001b;", "meth1", "()V", 7,
+ "Lnsk/jvmti/Exception/exception001a;", "run", "()V", 14 },
+ { "Ljava/lang/ArithmeticException;",
+ "Lnsk/jvmti/Exception/exception001b;", "meth2", "(I)I", 3,
+ "Lnsk/jvmti/Exception/exception001a;", "run", "()V", 24 },
+ { "Ljava/lang/ArrayIndexOutOfBoundsException;",
+ "Lnsk/jvmti/Exception/exception001b;", "meth3", "(I)I", 10,
+ "Lnsk/jvmti/Exception/exception001a;", "run", "()V", 34 }
};
static int eventsCount = 0;
static int eventsExpected = 0;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ExceptionCatch/excatch001/excatch001.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ExceptionCatch/excatch001/excatch001.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -55,12 +55,12 @@
static jint result = PASSED;
static jboolean printdump = JNI_FALSE;
static exceptionInfo exs[] = {
- {"Lnsk/jvmti/ExceptionCatch/excatch001c;",
- "Lnsk/jvmti/ExceptionCatch/excatch001a;", "run", "()V", 14},
- {"Ljava/lang/ArithmeticException;",
- "Lnsk/jvmti/ExceptionCatch/excatch001a;", "run", "()V", 24},
- {"Ljava/lang/ArrayIndexOutOfBoundsException;",
- "Lnsk/jvmti/ExceptionCatch/excatch001a;", "run", "()V", 34}
+ { "Lnsk/jvmti/ExceptionCatch/excatch001c;",
+ "Lnsk/jvmti/ExceptionCatch/excatch001a;", "run", "()V", 14 },
+ { "Ljava/lang/ArithmeticException;",
+ "Lnsk/jvmti/ExceptionCatch/excatch001a;", "run", "()V", 24 },
+ { "Ljava/lang/ArrayIndexOutOfBoundsException;",
+ "Lnsk/jvmti/ExceptionCatch/excatch001a;", "run", "()V", 34 }
};
static int eventsCount = 0;
static int eventsExpected = 0;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm005/getfldnm005.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm005/getfldnm005.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -40,47 +40,47 @@
/* expected field signatures are below */
static const char *fld_sig[][FLDS_NUM] = {
- {"_getfldnm005St", "static",
- "Lnsk/jvmti/GetFieldName/getfldnm005;", "NULL"},
+ { "_getfldnm005St", "static",
+ "Lnsk/jvmti/GetFieldName/getfldnm005;", "NULL" },
- {"_getfldnm005b", "instance",
- "Lnsk/jvmti/GetFieldName/getfldnm005b;",
- "Lnsk/jvmti/GetFieldName/getfldnm005b<Ljava/lang/String;>;"},
- {"_getfldnm005bSt", "static",
- "Lnsk/jvmti/GetFieldName/getfldnm005b;",
- "Lnsk/jvmti/GetFieldName/getfldnm005b<Ljava/lang/String;>;"},
+ { "_getfldnm005b", "instance",
+ "Lnsk/jvmti/GetFieldName/getfldnm005b;",
+ "Lnsk/jvmti/GetFieldName/getfldnm005b<Ljava/lang/String;>;" },
+ { "_getfldnm005bSt", "static",
+ "Lnsk/jvmti/GetFieldName/getfldnm005b;",
+ "Lnsk/jvmti/GetFieldName/getfldnm005b<Ljava/lang/String;>;" },
- {"_getfldnm005c", "instance",
- "Lnsk/jvmti/GetFieldName/getfldnm005c;",
- "Lnsk/jvmti/GetFieldName/getfldnm005c<Ljava/lang/Boolean;Ljava/lang/Integer;>;"},
- {"_getfldnm005cSt", "static",
- "Lnsk/jvmti/GetFieldName/getfldnm005c;",
- "Lnsk/jvmti/GetFieldName/getfldnm005c<Ljava/lang/Boolean;Ljava/lang/Integer;>;"},
+ { "_getfldnm005c", "instance",
+ "Lnsk/jvmti/GetFieldName/getfldnm005c;",
+ "Lnsk/jvmti/GetFieldName/getfldnm005c<Ljava/lang/Boolean;Ljava/lang/Integer;>;" },
+ { "_getfldnm005cSt", "static",
+ "Lnsk/jvmti/GetFieldName/getfldnm005c;",
+ "Lnsk/jvmti/GetFieldName/getfldnm005c<Ljava/lang/Boolean;Ljava/lang/Integer;>;" },
- {"_getfldnm005e", "instance",
- "Lnsk/jvmti/GetFieldName/getfldnm005e;",
- "NULL"},
- {"_getfldnm005eSt", "static",
- "Lnsk/jvmti/GetFieldName/getfldnm005e;",
- "NULL"},
+ { "_getfldnm005e", "instance",
+ "Lnsk/jvmti/GetFieldName/getfldnm005e;",
+ "NULL" },
+ { "_getfldnm005eSt", "static",
+ "Lnsk/jvmti/GetFieldName/getfldnm005e;",
+ "NULL" },
- {"_getfldnm005if", "instance",
- "Lnsk/jvmti/GetFieldName/getfldnm005if;",
- "Lnsk/jvmti/GetFieldName/getfldnm005if<Ljava/lang/Object;>;"},
- {"_getfldnm005ifSt", "static",
- "Lnsk/jvmti/GetFieldName/getfldnm005if;",
- "Lnsk/jvmti/GetFieldName/getfldnm005if<Ljava/lang/Object;>;"},
+ { "_getfldnm005if", "instance",
+ "Lnsk/jvmti/GetFieldName/getfldnm005if;",
+ "Lnsk/jvmti/GetFieldName/getfldnm005if<Ljava/lang/Object;>;" },
+ { "_getfldnm005ifSt", "static",
+ "Lnsk/jvmti/GetFieldName/getfldnm005if;",
+ "Lnsk/jvmti/GetFieldName/getfldnm005if<Ljava/lang/Object;>;" },
- {"_getfldnm005g", "instance",
- "Lnsk/jvmti/GetFieldName/getfldnm005g;",
- "Lnsk/jvmti/GetFieldName/getfldnm005g<Lnsk/jvmti/GetFieldName/getfldnm005f;>;"},
- {"_getfldnm005gSt", "static",
- "Lnsk/jvmti/GetFieldName/getfldnm005g;",
- "Lnsk/jvmti/GetFieldName/getfldnm005g<Lnsk/jvmti/GetFieldName/getfldnm005f;>;"},
+ { "_getfldnm005g", "instance",
+ "Lnsk/jvmti/GetFieldName/getfldnm005g;",
+ "Lnsk/jvmti/GetFieldName/getfldnm005g<Lnsk/jvmti/GetFieldName/getfldnm005f;>;" },
+ { "_getfldnm005gSt", "static",
+ "Lnsk/jvmti/GetFieldName/getfldnm005g;",
+ "Lnsk/jvmti/GetFieldName/getfldnm005g<Lnsk/jvmti/GetFieldName/getfldnm005f;>;" },
- {"_getfldnm005gArr", "instance",
- "[Lnsk/jvmti/GetFieldName/getfldnm005g;",
- "NULL"}
+ { "_getfldnm005gArr", "instance",
+ "[Lnsk/jvmti/GetFieldName/getfldnm005g;",
+ "NULL" }
};
static jvmtiEnv *jvmti = NULL;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFrameLocation/frameloc002/frameloc002.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFrameLocation/frameloc002/frameloc002.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -45,8 +45,8 @@
static jint result = PASSED;
static jboolean printdump = JNI_FALSE;
static frame_info fi =
- {"Lnsk/jvmti/GetFrameLocation/frameloc002;", "check",
- "(Ljava/lang/Thread;)I", -1};
+ { "Lnsk/jvmti/GetFrameLocation/frameloc002;", "check",
+ "(Ljava/lang/Thread;)I", -1 };
#ifdef STATIC_BUILD
JNIEXPORT jint JNICALL Agent_OnLoad_frameloc002(JavaVM *jvm, char *options, void *reserved) {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls003/declcls003.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls003/declcls003.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -37,7 +37,7 @@
static jint result = PASSED;
static jboolean printdump = JNI_FALSE;
static const char *exp_class_sig = "Ljava/lang/Object;";
-static const char *arr_sigs[] = {"[B", "[C", "[D", "[F", "[I", "[J", "[S", "[Z",
+static const char *arr_sigs[] = { "[B", "[C", "[D", "[F", "[I", "[J", "[S", "[Z",
"[Lnsk/jvmti/GetMethodDeclaringClass/declcls003;",
"[[Lnsk/jvmti/GetMethodDeclaringClass/declcls003;"
};
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname003/methname003.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname003/methname003.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -44,40 +44,40 @@
/* expected class signatures are below */
static const char *meth_sig[][METH_NUM][TOT_NUM] = {
- {{"methname003bMeth", "instance",
+ { { "methname003bMeth", "instance",
"(Lnsk/jvmti/GetMethodName/methname003b;)Lnsk/jvmti/GetMethodName/methname003b;",
- "<L:Ljava/lang/String;>(Lnsk/jvmti/GetMethodName/methname003b<TL;>;)Lnsk/jvmti/GetMethodName/methname003b<Ljava/lang/String;>;"},
- {"methname003bMethSt", "static",
- "(Lnsk/jvmti/GetMethodName/methname003b;)Lnsk/jvmti/GetMethodName/methname003b;",
- "<T:Ljava/lang/String;>(Lnsk/jvmti/GetMethodName/methname003b<TT;>;)Lnsk/jvmti/GetMethodName/methname003b<Ljava/lang/String;>;"}},
+ "<L:Ljava/lang/String;>(Lnsk/jvmti/GetMethodName/methname003b<TL;>;)Lnsk/jvmti/GetMethodName/methname003b<Ljava/lang/String;>;" },
+ { "methname003bMethSt", "static",
+ "(Lnsk/jvmti/GetMethodName/methname003b;)Lnsk/jvmti/GetMethodName/methname003b;",
+ "<T:Ljava/lang/String;>(Lnsk/jvmti/GetMethodName/methname003b<TT;>;)Lnsk/jvmti/GetMethodName/methname003b<Ljava/lang/String;>;" } },
- {{"methname003cMeth", "instance",
+ { { "methname003cMeth", "instance",
"(Ljava/lang/Class;)Ljava/lang/Object;",
- "<U:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;)TU;"},
- {"methname003cMethSt", "static",
- "(Ljava/lang/Class;)Ljava/lang/Object;",
- "<U:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;)TU;"}},
+ "<U:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;)TU;" },
+ { "methname003cMethSt", "static",
+ "(Ljava/lang/Class;)Ljava/lang/Object;",
+ "<U:Ljava/lang/Object;>(Ljava/lang/Class<TU;>;)TU;" } },
- {{"methname003eMeth", "instance",
+ { { "methname003eMeth", "instance",
"(Lnsk/jvmti/GetMethodName/methname003e;)V",
- "NULL"},
- {"methname003eMethSt", "static",
- "(Lnsk/jvmti/GetMethodName/methname003e;)V",
- "NULL"}},
+ "NULL" },
+ { "methname003eMethSt", "static",
+ "(Lnsk/jvmti/GetMethodName/methname003e;)V",
+ "NULL" } },
- {{"methname003ifMeth", "instance",
+ { { "methname003ifMeth", "instance",
"()I",
- "NULL"},
- {"methname003ifMeth2", "instance",
- "(Ljava/lang/Object;)I",
- "<T:Ljava/lang/Object;>(TT;)I"}},
+ "NULL" },
+ { "methname003ifMeth2", "instance",
+ "(Ljava/lang/Object;)I",
+ "<T:Ljava/lang/Object;>(TT;)I" } },
- {{"methname003gMeth", "instance",
+ { { "methname003gMeth", "instance",
"(Ljava/lang/Byte;Ljava/lang/Double;[Ljava/lang/Class;)V",
- "<A:Ljava/lang/Byte;B:Ljava/lang/Double;>(TA;TB;[Ljava/lang/Class<*>;)V"},
- {"methname003gMethSt", "static",
- "(Ljava/lang/Byte;Ljava/lang/Double;)V",
- "<A:Ljava/lang/Byte;B:Ljava/lang/Double;>(TA;TB;)V"}}
+ "<A:Ljava/lang/Byte;B:Ljava/lang/Double;>(TA;TB;[Ljava/lang/Class<*>;)V" },
+ { "methname003gMethSt", "static",
+ "(Ljava/lang/Byte;Ljava/lang/Double;)V",
+ "<A:Ljava/lang/Byte;B:Ljava/lang/Double;>(TA;TB;)V" } }
};
static jvmtiEnv *jvmti = NULL;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -66,10 +66,8 @@
static jint TAGGED_INT_VALUE = 0xC0DE02 + POISON;
static jint UNTAGGED_STATIC_INT_VALUE = 0xC0DE03 + POISON;
static jint UNTAGGED_INT_VALUE = 0xC0DE04 + POISON;
-static jint TAGGED_INT_ARRAY_VALUE[] = {0xC0DE01,
- 0xC0DE01+1};
-static jint UNTAGGED_INT_ARRAY_VALUE[] = {0xC0DE03,
- 0xC0DE03+1};
+static jint TAGGED_INT_ARRAY_VALUE[] = { 0xC0DE01, 0xC0DE01 + 1 };
+static jint UNTAGGED_INT_ARRAY_VALUE[] = { 0xC0DE03, 0xC0DE03 + 1 };
static const wchar_t *TAGGED_STRING_VALUE = L"I'm a tagged string";
static const wchar_t *UNTAGGED_STRING_VALUE = L"I'm an untagged string";
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/non-concrete-klass-filter/NonConcreteKlassFilter.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/non-concrete-klass-filter/NonConcreteKlassFilter.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -52,7 +52,7 @@
//klass-filters used in this test
#define FILTER_COUNT 2
static const char *types[] = { "nsk/jvmti/IterateThroughHeap/non_concrete_klass_filter/Interface",
- "nsk/jvmti/IterateThroughHeap/non_concrete_klass_filter/AbstractClass"};
+ "nsk/jvmti/IterateThroughHeap/non_concrete_klass_filter/AbstractClass" };
jint JNICALL field_callback(jvmtiHeapReferenceKind kind,
const jvmtiHeapReferenceInfo* info,
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MethodEntry/mentry001/mentry001.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MethodEntry/mentry001/mentry001.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -54,9 +54,9 @@
static size_t eventsExpected = 0;
static size_t eventsCount = 0;
static entry_info entries[] = {
- {"check", "()I", -1},
- {"dummy", "()V", 0},
- {"chain", "()V", -1}
+ { "check", "()I", -1 },
+ { "dummy", "()V", 0 },
+ { "chain", "()V", -1 }
};
void JNICALL MethodEntry(jvmtiEnv *jvmti_env, JNIEnv *env,
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MethodExit/mexit001/mexit001.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MethodExit/mexit001/mexit001.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -50,8 +50,8 @@
static size_t eventsExpected = 0;
static size_t eventsCount = 0;
static exit_info exits[] = {
- {"Lnsk/jvmti/MethodExit/mexit001a;", "chain", "()V", -1},
- {"Lnsk/jvmti/MethodExit/mexit001a;", "dummy", "()V", 3}
+ { "Lnsk/jvmti/MethodExit/mexit001a;", "chain", "()V", -1 },
+ { "Lnsk/jvmti/MethodExit/mexit001a;", "dummy", "()V", 3 }
};
void JNICALL MethodExit(jvmtiEnv *jvmti_env, JNIEnv *env,
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MethodExit/mexit002/mexit002.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MethodExit/mexit002/mexit002.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -50,8 +50,8 @@
static size_t eventsExpected = 0;
static size_t eventsCount = 0;
static exit_info exits[] = {
- {"Lnsk/jvmti/MethodExit/mexit002a;", "chain", "()V", -1},
- {"Lnsk/jvmti/MethodExit/mexit002a;", "dummy", "()V", 3}
+ { "Lnsk/jvmti/MethodExit/mexit002a;", "chain", "()V", -1 },
+ { "Lnsk/jvmti/MethodExit/mexit002a;", "dummy", "()V", 3 }
};
void JNICALL MethodExit(jvmtiEnv *jvmti_env, JNIEnv *env,
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind001/nativemethbind001.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind001/nativemethbind001.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -39,15 +39,15 @@
/* tested methods */
#define METH_NUM 2
static const char *METHODS[][2] = {
- {"nativeMethod", "(Z)V"},
- {"anotherNativeMethod", "()V"},
+ { "nativeMethod", "(Z)V" },
+ { "anotherNativeMethod", "()V" },
};
/* event counters for the tested methods and expected numbers
of the events */
static volatile int bindEv[][2] = {
- {0, 1},
- {0, 1}
+ { 0, 1 },
+ { 0, 1 }
};
static const char *CLASS_SIG =
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe006/popframe006.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe006/popframe006.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -51,15 +51,15 @@
static int stepCount = 0, stepExpected = 0;
static int popCount = 0, popExpected = 0;
static check_info checks[] = {
- {"Lnsk/jvmti/PopFrame/popframe006$TestThread;", "run", "()V", 0},
- {"Lnsk/jvmti/PopFrame/popframe006$TestThread;", "A", "()V", 0},
- {"Lnsk/jvmti/PopFrame/popframe006$TestThread;", "B", "()V", 0},
- {"Lnsk/jvmti/PopFrame/popframe006$TestThread;", "A", "()V", 0},
- {"Lnsk/jvmti/PopFrame/popframe006$TestThread;", "B", "()V", 0},
- {"Lnsk/jvmti/PopFrame/popframe006$TestThread;", "C", "()V", 0},
- {"Lnsk/jvmti/PopFrame/popframe006$TestThread;", "C", "()V", 0},
- {"Lnsk/jvmti/PopFrame/popframe006$TestThread;", "B", "()V", 3},
- {"Lnsk/jvmti/PopFrame/popframe006$TestThread;", "A", "()V", 3}
+ { "Lnsk/jvmti/PopFrame/popframe006$TestThread;", "run", "()V", 0 },
+ { "Lnsk/jvmti/PopFrame/popframe006$TestThread;", "A", "()V", 0 },
+ { "Lnsk/jvmti/PopFrame/popframe006$TestThread;", "B", "()V", 0 },
+ { "Lnsk/jvmti/PopFrame/popframe006$TestThread;", "A", "()V", 0 },
+ { "Lnsk/jvmti/PopFrame/popframe006$TestThread;", "B", "()V", 0 },
+ { "Lnsk/jvmti/PopFrame/popframe006$TestThread;", "C", "()V", 0 },
+ { "Lnsk/jvmti/PopFrame/popframe006$TestThread;", "C", "()V", 0 },
+ { "Lnsk/jvmti/PopFrame/popframe006$TestThread;", "B", "()V", 3 },
+ { "Lnsk/jvmti/PopFrame/popframe006$TestThread;", "A", "()V", 3 }
};
void check(jvmtiEnv *jvmti_env, jmethodID mid, jlocation loc, int i) {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe008/popframe008.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe008/popframe008.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -50,10 +50,10 @@
static int framesExpected = 0;
static int framesCount = 0;
static frame_info frames[] = {
- {"Lnsk/jvmti/PopFrame/popframe008$TestThread;", "C", "()V", 1},
- {"Lnsk/jvmti/PopFrame/popframe008$TestThread;", "B", "()V", 1},
- {"Lnsk/jvmti/PopFrame/popframe008$TestThread;", "A", "()V", 1},
- {"Lnsk/jvmti/PopFrame/popframe008$TestThread;", "run", "()V", 1}
+ { "Lnsk/jvmti/PopFrame/popframe008$TestThread;", "C", "()V", 1 },
+ { "Lnsk/jvmti/PopFrame/popframe008$TestThread;", "B", "()V", 1 },
+ { "Lnsk/jvmti/PopFrame/popframe008$TestThread;", "A", "()V", 1 },
+ { "Lnsk/jvmti/PopFrame/popframe008$TestThread;", "run", "()V", 1 }
};
void check(jvmtiEnv *jvmti_env, jmethodID mid, jlocation loc, int i) {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass008/redefclass008.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass008/redefclass008.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -45,11 +45,11 @@
/* list of breakpoints */
static breakpoint breakpoints[] = {
- {1, (char*) "checkIt", (char*) "(Ljava/io/PrintStream;Z)I", 0, NULL},
- {1, (char*) "finMethod", (char*) "(JIJ)V", 5, NULL},
- {1, (char*) "finMethod", (char*) "(JIJ)V", 4, NULL},
- {1, (char*) "checkIt", (char*) "(Ljava/io/PrintStream;Z)I", 1, NULL},
- {0, (char*) "statMethod", (char*) "(III)I", 1, NULL}
+ { 1, (char*) "checkIt", (char*) "(Ljava/io/PrintStream;Z)I", 0, NULL },
+ { 1, (char*) "finMethod", (char*) "(JIJ)V", 5, NULL },
+ { 1, (char*) "finMethod", (char*) "(JIJ)V", 4, NULL },
+ { 1, (char*) "checkIt", (char*) "(Ljava/io/PrintStream;Z)I", 1, NULL },
+ { 0, (char*) "statMethod", (char*) "(III)I", 1, NULL }
};
static jclass redefCls; /* JNI's Java class object */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass009/redefclass009.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass009/redefclass009.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -42,33 +42,33 @@
/* local variables of redefined methods */
static localVar constr_lv[] = { /* constructor's local variables */
- {(char*) "this", (char*) "Lnsk/jvmti/RedefineClasses/redefclass009r;"},
- {(char*) "constr_i", (char*) "I"},
- {(char*) "constr_l", (char*) "J"},
- {(char*) "constr_d", (char*) "D"},
- {(char*) "constr_f", (char*) "F"},
- {(char*) "constr_c", (char*) "C"}
+ { (char*) "this", (char*) "Lnsk/jvmti/RedefineClasses/redefclass009r;" },
+ { (char*) "constr_i", (char*) "I" },
+ { (char*) "constr_l", (char*) "J" },
+ { (char*) "constr_d", (char*) "D" },
+ { (char*) "constr_f", (char*) "F" },
+ { (char*) "constr_c", (char*) "C" }
};
static localVar checkIt_lv[] = { /* checkIt()'s local variables */
- {(char*) "this", (char*) "Lnsk/jvmti/RedefineClasses/redefclass009r;"},
- {(char*) "out", (char*) "Ljava/io/PrintStream;"},
- {(char*) "DEBUG_MODE", (char*) "Z"}
+ { (char*) "this", (char*) "Lnsk/jvmti/RedefineClasses/redefclass009r;" },
+ { (char*) "out", (char*) "Ljava/io/PrintStream;" },
+ { (char*) "DEBUG_MODE", (char*) "Z" }
};
static localVar finMeth_lv[] = { /* finMethod()'s local variables */
- {(char*) "this", (char*) "Lnsk/jvmti/RedefineClasses/redefclass009r;"},
- {(char*) "fin_c", (char*) "C"},
- {(char*) "fin_i", (char*) "J"},
- {(char*) "fin_j", (char*) "I"},
- {(char*) "fin_k", (char*) "J"},
- {(char*) "fin_l", (char*) "J"},
- {(char*) "fin_f", (char*) "F"}
+ { (char*) "this", (char*) "Lnsk/jvmti/RedefineClasses/redefclass009r;" },
+ { (char*) "fin_c", (char*) "C" },
+ { (char*) "fin_i", (char*) "J" },
+ { (char*) "fin_j", (char*) "I" },
+ { (char*) "fin_k", (char*) "J" },
+ { (char*) "fin_l", (char*) "J" },
+ { (char*) "fin_f", (char*) "F" }
};
static localVar statMeth_lv[] = { /* statMethod()'s local variables */
- {(char*) "stat_x", (char*) "I"},
- {(char*) "stat_y", (char*) "I"},
- {(char*) "stat_z", (char*) "I"},
- {(char*) "stat_j", (char*) "D"},
- {(char*) "stat_i", (char*) "I"}
+ { (char*) "stat_x", (char*) "I" },
+ { (char*) "stat_y", (char*) "I" },
+ { (char*) "stat_z", (char*) "I" },
+ { (char*) "stat_j", (char*) "D" },
+ { (char*) "stat_i", (char*) "I" }
};
typedef struct { /* local variables of a method */
@@ -82,18 +82,18 @@
/* list of original methods with NULL pointers to localVar */
static methInfo origMethInfo[] = {
- {1, (char*) "<init>", (char*) "()V", 1, NULL, NULL},
- {1, (char*) "checkIt", (char*) "(Ljava/io/PrintStream;Z)I", 4, NULL, NULL},
- {1, (char*) "finMethod", (char*) "(CJIJ)V", 5, NULL, NULL},
- {0, (char*) "statMethod", (char*) "(III)D", 3, NULL, NULL}
+ { 1, (char*) "<init>", (char*) "()V", 1, NULL, NULL },
+ { 1, (char*) "checkIt", (char*) "(Ljava/io/PrintStream;Z)I", 4, NULL, NULL },
+ { 1, (char*) "finMethod", (char*) "(CJIJ)V", 5, NULL, NULL },
+ { 0, (char*) "statMethod", (char*) "(III)D", 3, NULL, NULL }
};
/* list of redefined methods */
static methInfo redefMethInfo[] = {
- {1, (char*) "<init>", (char*) "()V", 6, constr_lv, NULL},
- {1, (char*) "checkIt", (char*) "(Ljava/io/PrintStream;Z)I", 3, checkIt_lv, NULL},
- {1, (char*) "finMethod", (char*) "(CJIJ)V", 7, finMeth_lv, NULL},
- {0, (char*) "statMethod", (char*) "(III)D", 5, statMeth_lv, NULL}
+ { 1, (char*) "<init>", (char*) "()V", 6, constr_lv, NULL },
+ { 1, (char*) "checkIt", (char*) "(Ljava/io/PrintStream;Z)I", 3, checkIt_lv, NULL },
+ { 1, (char*) "finMethod", (char*) "(CJIJ)V", 7, finMeth_lv, NULL },
+ { 0, (char*) "statMethod", (char*) "(III)D", 5, statMeth_lv, NULL }
};
static jvmtiEnv *jvmti = NULL;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass010/redefclass010.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass010/redefclass010.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -37,18 +37,18 @@
/* line number matrix of original methods */
static int orig_ln[METH_NUM][8] = {
- {34, 0, 0, 0, 0, 0, 0, 0}, /* <init> */
- {40,41,43, 0, 0, 0, 0, 0}, /* checkIt */
- {55, 0, 0, 0, 0, 0, 0, 0}, /* finMethod */
- {48,50,51,50,52, 0, 0, 0} /* statMethod */
+ { 34, 0, 0, 0, 0, 0, 0, 0 }, /* <init> */
+ { 40,41,43, 0, 0, 0, 0, 0 }, /* checkIt */
+ { 55, 0, 0, 0, 0, 0, 0, 0 }, /* finMethod */
+ { 48,50,51,50,52, 0, 0, 0 } /* statMethod */
};
/* line number matrix of redefined methods */
static int redf_ln[METH_NUM][8] = {
- {38,39,40,41,42,43,44,46}, /* <init> */
- {51,53,55, 0, 0, 0, 0, 0}, /* checkIt */
- {64,66,67,68,69,70,72, 0}, /* finMethod */
- {60, 0, 0, 0, 0, 0, 0, 0} /* statMethod */
+ { 38,39,40,41,42,43,44,46 }, /* <init> */
+ { 51,53,55, 0, 0, 0, 0, 0 }, /* checkIt */
+ { 64,66,67,68,69,70,72, 0 }, /* finMethod */
+ { 60, 0, 0, 0, 0, 0, 0, 0 } /* statMethod */
};
typedef struct { /* line numbers of a method */
@@ -61,18 +61,18 @@
/* list of original methods */
static methInfo origMethInfo[] = {
- {1, (char*) "<init>", (char*) "()V", 1, NULL},
- {1, (char*) "checkIt", (char*) "(Ljava/io/PrintStream;Z)I", 3, NULL},
- {1, (char*) "finMethod", (char*) "(CJIJ)V", 1, NULL},
- {0, (char*) "statMethod", (char*) "(III)D", 5, NULL}
+ { 1, (char*) "<init>", (char*) "()V", 1, NULL },
+ { 1, (char*) "checkIt", (char*) "(Ljava/io/PrintStream;Z)I", 3, NULL },
+ { 1, (char*) "finMethod", (char*) "(CJIJ)V", 1, NULL },
+ { 0, (char*) "statMethod", (char*) "(III)D", 5, NULL }
};
/* list of redefined methods */
static methInfo redefMethInfo[] = {
- {1, (char*) "<init>", (char*) "()V", 8, NULL},
- {1, (char*) "checkIt", (char*) "(Ljava/io/PrintStream;Z)I", 3, NULL},
- {1, (char*) "finMethod", (char*) "(CJIJ)V", 7, NULL},
- {0, (char*) "statMethod", (char*) "(III)D", 1, NULL}
+ { 1, (char*) "<init>", (char*) "()V", 8, NULL },
+ { 1, (char*) "checkIt", (char*) "(Ljava/io/PrintStream;Z)I", 3, NULL },
+ { 1, (char*) "finMethod", (char*) "(CJIJ)V", 7, NULL },
+ { 0, (char*) "statMethod", (char*) "(III)D", 1, NULL }
};
static jvmtiEnv *jvmti = NULL;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass019/redefclass019.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass019/redefclass019.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -62,33 +62,33 @@
static const char *cls_exp = "Lnsk/jvmti/RedefineClasses/redefclass019a;";
static var_info run[] = {
- {"this", "Lnsk/jvmti/RedefineClasses/redefclass019a;", 0}
+ { "this", "Lnsk/jvmti/RedefineClasses/redefclass019a;", 0 }
};
static var_info checkPoint[] = {
- {"this", "Lnsk/jvmti/RedefineClasses/redefclass019a;", 0}
+ { "this", "Lnsk/jvmti/RedefineClasses/redefclass019a;", 0 }
};
static var_info chain1[] = {
- {"this", "Lnsk/jvmti/RedefineClasses/redefclass019a;", 0},
- {"localInt1", "I", 2},
- {"localInt2", "I", 3333}
+ { "this", "Lnsk/jvmti/RedefineClasses/redefclass019a;", 0 },
+ { "localInt1", "I", 2 },
+ { "localInt2", "I", 3333 }
};
static var_info chain2[] = {
- {"this", "Lnsk/jvmti/RedefineClasses/redefclass019a;", 0}
+ { "this", "Lnsk/jvmti/RedefineClasses/redefclass019a;", 0 }
};
static var_info chain3[] = {
- {"this", "Lnsk/jvmti/RedefineClasses/redefclass019a;", 0}
+ { "this", "Lnsk/jvmti/RedefineClasses/redefclass019a;", 0 }
};
static frame_info frames[] = {
- {JNI_TRUE, "checkPoint", "()V", 115, 1, checkPoint},
- {JNI_FALSE, "chain3", "()V", 49, 1, chain3},
- {JNI_FALSE, "chain2", "()V", 44, 1, chain2},
- {JNI_FALSE, "chain1", "()V", 39, 3, chain1},
- {JNI_FALSE, "run", "()V", 32, 1, run},
+ { JNI_TRUE, "checkPoint", "()V", 115, 1, checkPoint },
+ { JNI_FALSE, "chain3", "()V", 49, 1, chain3 },
+ { JNI_FALSE, "chain2", "()V", 44, 1, chain2 },
+ { JNI_FALSE, "chain1", "()V", 39, 3, chain1 },
+ { JNI_FALSE, "run", "()V", 32, 1, run },
};
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass027/redefclass027.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass027/redefclass027.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -80,38 +80,38 @@
static const char *cls_exp = "Lnsk/jvmti/RedefineClasses/redefclass027a;";
static var_info run[] = {
- {"this", "Lnsk/jvmti/RedefineClasses/redefclass027a;", 0},
- {"localInt1", "I", 1}
+ { "this", "Lnsk/jvmti/RedefineClasses/redefclass027a;", 0 },
+ { "localInt1", "I", 1 }
};
static var_info method1[] = {
- {"this", "Lnsk/jvmti/RedefineClasses/redefclass027a;", 0},
- {"argInt1", "I", 10},
- {"localInt2", "I", 2},
- {"ex", "Ljava/lang/Exception;", 0}
+ { "this", "Lnsk/jvmti/RedefineClasses/redefclass027a;", 0 },
+ { "argInt1", "I", 10 },
+ { "localInt2", "I", 2 },
+ { "ex", "Ljava/lang/Exception;", 0 }
};
static var_info pop[] = {
- {"this", "Lnsk/jvmti/RedefineClasses/redefclass027a;", 0},
- {"argInt1", "I", 10},
- {"localInt2", "I", 2},
- {"ex", "Ljava/lang/Exception;", 0}
+ { "this", "Lnsk/jvmti/RedefineClasses/redefclass027a;", 0 },
+ { "argInt1", "I", 10 },
+ { "localInt2", "I", 2 },
+ { "ex", "Ljava/lang/Exception;", 0 }
};
static var_info method2[] = {
- {"this", "Lnsk/jvmti/RedefineClasses/redefclass027a;", 0},
- {"argInt2", "I", 20},
- {"localInt4", "I", 4}
+ { "this", "Lnsk/jvmti/RedefineClasses/redefclass027a;", 0 },
+ { "argInt2", "I", 20 },
+ { "localInt4", "I", 4 }
};
static frame_info frames[] = {
- {JNI_FALSE, "run", "()V", 97, 2, run, "bp"},
- {JNI_FALSE, "run", "()V", 97, 2, run, "step"},
- {JNI_FALSE, "run", "()V", 99, 2, run, "mod"},
- {JNI_FALSE, "method2", "(I)V", 116, 3, method2, "acc"},
- {JNI_FALSE, "method2", "(I)V", 117, 3, method2, "exc"},
- {JNI_FALSE, "method1", "(I)V", 108, 4, method1, "catch"},
- {JNI_FALSE, "method1", "(I)V", 112, 4, pop, "pop"},
+ { JNI_FALSE, "run", "()V", 97, 2, run, "bp" },
+ { JNI_FALSE, "run", "()V", 97, 2, run, "step" },
+ { JNI_FALSE, "run", "()V", 99, 2, run, "mod" },
+ { JNI_FALSE, "method2", "(I)V", 116, 3, method2, "acc" },
+ { JNI_FALSE, "method2", "(I)V", 117, 3, method2, "exc" },
+ { JNI_FALSE, "method1", "(I)V", 108, 4, method1, "catch" },
+ { JNI_FALSE, "method1", "(I)V", 112, 4, pop, "pop" },
};
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/setfldw001.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/setfldw001.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -48,12 +48,12 @@
static jvmtiCapabilities caps;
static jint result = PASSED;
static field fields[] = {
- {"nsk/jvmti/SetFieldAccessWatch/setfldw001", "fld0", "I", 0, NULL, NULL},
- {"nsk/jvmti/SetFieldAccessWatch/setfldw001", "fld1", "I", 1, NULL, NULL},
- {"nsk/jvmti/SetFieldAccessWatch/setfldw001", "fld2",
- "Lnsk/jvmti/SetFieldAccessWatch/setfldw001a;", 0, NULL, NULL},
- {"nsk/jvmti/SetFieldAccessWatch/setfldw001a", "fld3", "[I", 0, NULL, NULL},
- {"nsk/jvmti/SetFieldAccessWatch/setfldw001b", "fld4", "F", 0, NULL, NULL},
+ { "nsk/jvmti/SetFieldAccessWatch/setfldw001", "fld0", "I", 0, NULL, NULL },
+ { "nsk/jvmti/SetFieldAccessWatch/setfldw001", "fld1", "I", 1, NULL, NULL },
+ { "nsk/jvmti/SetFieldAccessWatch/setfldw001", "fld2",
+ "Lnsk/jvmti/SetFieldAccessWatch/setfldw001a;", 0, NULL, NULL },
+ { "nsk/jvmti/SetFieldAccessWatch/setfldw001a", "fld3", "[I", 0, NULL, NULL },
+ { "nsk/jvmti/SetFieldAccessWatch/setfldw001b", "fld4", "F", 0, NULL, NULL },
};
void setWatch(JNIEnv *env, jint ind) {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw003/setfldw003.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw003/setfldw003.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -40,7 +40,7 @@
static jint result = PASSED;
static jboolean printdump = JNI_FALSE;
static jfieldID actual_fid = NULL;
-static jfieldID fids[4] = {NULL, NULL, NULL, NULL};
+static jfieldID fids[4] = { NULL, NULL, NULL, NULL };
void JNICALL FieldAccess(jvmtiEnv *jvmti_env, JNIEnv *env,
jthread thr, jmethodID method,
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw004/setfldw004.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw004/setfldw004.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -40,7 +40,7 @@
static jint result = PASSED;
static jboolean printdump = JNI_FALSE;
static jfieldID actual_fid = NULL;
-static jfieldID fids[4] = {NULL, NULL, NULL, NULL};
+static jfieldID fids[4] = { NULL, NULL, NULL, NULL };
void JNICALL FieldAccess(jvmtiEnv *jvmti_env, JNIEnv *env,
jthread thr, jmethodID method,
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -49,22 +49,22 @@
static jboolean printdump = JNI_FALSE;
static jfieldID actual_fid = NULL;
static field fields[] = {
- {"fld0", "J", JNI_TRUE, NULL, "static long"},
- {"fld1", "J", JNI_FALSE, NULL, "long"},
- {"fld2", "F", JNI_TRUE, NULL, "static float"},
- {"fld3", "F", JNI_FALSE, NULL, "float"},
- {"fld4", "D", JNI_TRUE, NULL, "static double"},
- {"fld5", "D", JNI_FALSE, NULL, "double"},
- {"fld6", "Ljava/lang/Object;", JNI_TRUE, NULL, "static Object"},
- {"fld7", "Ljava/lang/Object;", JNI_FALSE, NULL, "Object"},
- {"fld8", "Z", JNI_TRUE, NULL, "static boolean"},
- {"fld9", "Z", JNI_FALSE, NULL, "boolean"},
- {"fld10", "B", JNI_TRUE, NULL, "static byte"},
- {"fld11", "B", JNI_FALSE, NULL, "byte"},
- {"fld12", "S", JNI_TRUE, NULL, "static short"},
- {"fld13", "S", JNI_FALSE, NULL, "short"},
- {"fld14", "C", JNI_TRUE, NULL, "static char"},
- {"fld15", "C", JNI_FALSE, NULL, "char"}
+ { "fld0", "J", JNI_TRUE, NULL, "static long" },
+ { "fld1", "J", JNI_FALSE, NULL, "long" },
+ { "fld2", "F", JNI_TRUE, NULL, "static float" },
+ { "fld3", "F", JNI_FALSE, NULL, "float" },
+ { "fld4", "D", JNI_TRUE, NULL, "static double" },
+ { "fld5", "D", JNI_FALSE, NULL, "double" },
+ { "fld6", "Ljava/lang/Object;", JNI_TRUE, NULL, "static Object" },
+ { "fld7", "Ljava/lang/Object;", JNI_FALSE, NULL, "Object" },
+ { "fld8", "Z", JNI_TRUE, NULL, "static boolean" },
+ { "fld9", "Z", JNI_FALSE, NULL, "boolean" },
+ { "fld10", "B", JNI_TRUE, NULL, "static byte" },
+ { "fld11", "B", JNI_FALSE, NULL, "byte" },
+ { "fld12", "S", JNI_TRUE, NULL, "static short" },
+ { "fld13", "S", JNI_FALSE, NULL, "short" },
+ { "fld14", "C", JNI_TRUE, NULL, "static char" },
+ { "fld15", "C", JNI_FALSE, NULL, "char" }
};
void JNICALL FieldAccess(jvmtiEnv *jvmti_env, JNIEnv *env,
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/setfmodw001.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/setfmodw001.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -48,12 +48,12 @@
static jvmtiCapabilities caps;
static jint result = PASSED;
static field fields[] = {
- {"nsk/jvmti/SetFieldModificationWatch/setfmodw001", "fld0", "I", 0, NULL, NULL},
- {"nsk/jvmti/SetFieldModificationWatch/setfmodw001", "fld1", "I", 1, NULL, NULL},
- {"nsk/jvmti/SetFieldModificationWatch/setfmodw001", "fld2",
- "Lnsk/jvmti/SetFieldModificationWatch/setfmodw001a;", 0, NULL, NULL},
- {"nsk/jvmti/SetFieldModificationWatch/setfmodw001a", "fld3", "[I", 0, NULL, NULL},
- {"nsk/jvmti/SetFieldModificationWatch/setfmodw001b", "fld4", "F", 0, NULL, NULL},
+ { "nsk/jvmti/SetFieldModificationWatch/setfmodw001", "fld0", "I", 0, NULL, NULL },
+ { "nsk/jvmti/SetFieldModificationWatch/setfmodw001", "fld1", "I", 1, NULL, NULL },
+ { "nsk/jvmti/SetFieldModificationWatch/setfmodw001", "fld2",
+ "Lnsk/jvmti/SetFieldModificationWatch/setfmodw001a;", 0, NULL, NULL },
+ { "nsk/jvmti/SetFieldModificationWatch/setfmodw001a", "fld3", "[I", 0, NULL, NULL },
+ { "nsk/jvmti/SetFieldModificationWatch/setfmodw001b", "fld4", "F", 0, NULL, NULL },
};
void setWatch(JNIEnv *env, jint ind) {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw003/setfmodw003.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw003/setfmodw003.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -51,10 +51,10 @@
static char actual_sig = '\0';
static jint actual_val = 0;
static field flds[] = {
- {"fld0", 'I', JNI_TRUE, 42, NULL},
- {"fld1", 'I', JNI_TRUE, 43, NULL},
- {"fld2", 'I', JNI_FALSE, 44, NULL},
- {"fld3", 'I', JNI_FALSE, 45, NULL}
+ { "fld0", 'I', JNI_TRUE, 42, NULL },
+ { "fld1", 'I', JNI_TRUE, 43, NULL },
+ { "fld2", 'I', JNI_FALSE, 44, NULL },
+ { "fld3", 'I', JNI_FALSE, 45, NULL }
};
void JNICALL FieldModification(jvmtiEnv *jvmti_env, JNIEnv *env,
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw004/setfmodw004.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw004/setfmodw004.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -51,10 +51,10 @@
static char actual_sig = '\0';
static jint actual_val = 0;
static field flds[] = {
- {"fld0", 'I', JNI_TRUE, 96, NULL},
- {"fld1", 'I', JNI_TRUE, 97, NULL},
- {"fld2", 'I', JNI_FALSE, 98, NULL},
- {"fld3", 'I', JNI_FALSE, 99, NULL}
+ { "fld0", 'I', JNI_TRUE, 96, NULL },
+ { "fld1", 'I', JNI_TRUE, 97, NULL },
+ { "fld2", 'I', JNI_FALSE, 98, NULL },
+ { "fld3", 'I', JNI_FALSE, 99, NULL }
};
void JNICALL FieldModification(jvmtiEnv *jvmti_env, JNIEnv *env,
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw005/setfmodw005.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw005/setfmodw005.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -52,22 +52,22 @@
static char actual_sig = '\0';
static jvalue actual_val = {};
static field flds[] = {
- {"fld0", "J", JNI_TRUE, "static long", NULL, {} },
- {"fld1", "J", JNI_FALSE, "long", NULL, {} },
- {"fld2", "F", JNI_TRUE, "static float", NULL, {} },
- {"fld3", "F", JNI_FALSE, "float", NULL, {} },
- {"fld4", "D", JNI_TRUE, "static double", NULL, {} },
- {"fld5", "D", JNI_FALSE, "double", NULL, {} },
- {"fld6", "Ljava/lang/Object;", JNI_TRUE, "static Object", NULL, {} },
- {"fld7", "Ljava/lang/Object;", JNI_FALSE, "Object", NULL, {} },
- {"fld8", "Z", JNI_TRUE, "static boolean", NULL, {} },
- {"fld9", "Z", JNI_FALSE, "boolean", NULL, {} },
- {"fld10", "B", JNI_TRUE, "static byte", NULL, {} },
- {"fld11", "B", JNI_FALSE, "byte", NULL, {} },
- {"fld12", "S", JNI_TRUE, "static short", NULL, {} },
- {"fld13", "S", JNI_FALSE, "short", NULL, {} },
- {"fld14", "C", JNI_TRUE, "static char", NULL, {} },
- {"fld15", "C", JNI_FALSE, "char", NULL, {} }
+ { "fld0", "J", JNI_TRUE, "static long", NULL, {} },
+ { "fld1", "J", JNI_FALSE, "long", NULL, {} },
+ { "fld2", "F", JNI_TRUE, "static float", NULL, {} },
+ { "fld3", "F", JNI_FALSE, "float", NULL, {} },
+ { "fld4", "D", JNI_TRUE, "static double", NULL, {} },
+ { "fld5", "D", JNI_FALSE, "double", NULL, {} },
+ { "fld6", "Ljava/lang/Object;", JNI_TRUE, "static Object", NULL, {} },
+ { "fld7", "Ljava/lang/Object;", JNI_FALSE, "Object", NULL, {} },
+ { "fld8", "Z", JNI_TRUE, "static boolean", NULL, {} },
+ { "fld9", "Z", JNI_FALSE, "boolean", NULL, {} },
+ { "fld10", "B", JNI_TRUE, "static byte", NULL, {} },
+ { "fld11", "B", JNI_FALSE, "byte", NULL, {} },
+ { "fld12", "S", JNI_TRUE, "static short", NULL, {} },
+ { "fld13", "S", JNI_FALSE, "short", NULL, {} },
+ { "fld14", "C", JNI_TRUE, "static char", NULL, {} },
+ { "fld15", "C", JNI_FALSE, "char", NULL, {} }
};
void JNICALL FieldModification(jvmtiEnv *jvmti_env, JNIEnv *env,
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop003/setsysprop003.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop003/setsysprop003.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -41,9 +41,9 @@
} PropertyDesc;
static PropertyDesc propDescList[PROPERTIES_COUNT] = {
- {"nsk.jvmti.test.property", "new value of nsk.jvmti.test.property"},
- {"nsk.jvmti.test.property.empty.old", "new value of nsk.jvmti.test.property.emply.old"},
- {"nsk.jvmti.test.property.empty.new", ""}
+ { "nsk.jvmti.test.property", "new value of nsk.jvmti.test.property" },
+ { "nsk.jvmti.test.property.empty.old", "new value of nsk.jvmti.test.property.emply.old" },
+ { "nsk.jvmti.test.property.empty.new", "" }
};
/* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SingleStep/singlestep001/singlestep001.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SingleStep/singlestep001/singlestep001.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -48,7 +48,7 @@
"([Ljava/lang/String;Ljava/io/PrintStream;)I"
};
-static volatile long stepEv[] = {0, 0};
+static volatile long stepEv[] = { 0, 0 };
static const char *CLASS_SIG =
"Lnsk/jvmti/SingleStep/singlestep001;";
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SingleStep/singlestep003/singlestep003.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SingleStep/singlestep003/singlestep003.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -39,19 +39,19 @@
/* tested methods */
#define METH_NUM 4
static const char *METHODS[][2] = {
- {"bpMethod", "()V"},
- {"nativeMethod", "()V"},
- {"anotherNativeMethod", "(I)V"},
- {"runThis", "([Ljava/lang/String;Ljava/io/PrintStream;)I"}
+ { "bpMethod", "()V" },
+ { "nativeMethod", "()V" },
+ { "anotherNativeMethod", "(I)V" },
+ { "runThis", "([Ljava/lang/String;Ljava/io/PrintStream;)I" }
};
/* event counters for the tested methods and expected numbers
of the events */
static volatile long stepEv[][2] = {
- {0, 1},
- {0, 0},
- {0, 0},
- {0, 1}
+ { 0, 1 },
+ { 0, 0 },
+ { 0, 0 },
+ { 0, 1 }
};
static const char *CLASS_SIG =
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t001/em05t001.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t001/em05t001.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -65,8 +65,8 @@
/* descriptions of tested methods */
static MethodDesc methodsDesc[METHODS_COUNT] = {
- {"javaMethod", "(I)I", NULL, 0, 0, 0},
- {"nativeMethod", "(I)I", NULL, 0, 0, 0}
+ { "javaMethod", "(I)I", NULL, 0, 0, 0 },
+ { "nativeMethod", "(I)I", NULL, 0, 0, 0 }
};
/* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t002/em05t002.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t002/em05t002.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -71,8 +71,8 @@
/* descriptions of tested methods */
static MethodDesc methodsDesc[METHODS_COUNT] = {
- {"javaMethod", "(I)I", NULL, 0, {}, {} },
- {"nativeMethod", "(I)I", NULL, 0, {}, {} }
+ { "javaMethod", "(I)I", NULL, 0, {}, {} },
+ { "nativeMethod", "(I)I", NULL, 0, {}, {} }
};
/* current compilation moment */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t002/ji03t002.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t002/ji03t002.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -53,8 +53,8 @@
} methInfo;
static methInfo meth_info[] = {
- {0, "statMeth", "(I)D", NULL, "statMeth_calls", NULL, 0, 0},
- {1, "voidMeth", "()V", NULL, "voidMeth_calls", NULL, 0, 0}
+ { 0, "statMeth", "(I)D", NULL, "statMeth_calls", NULL, 0, 0 },
+ { 1, "voidMeth", "()V", NULL, "voidMeth_calls", NULL, 0, 0 }
};
/* the original JNI function table */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t001/sp02t001.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t001/sp02t001.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -50,12 +50,12 @@
/* descriptions of tested threads */
static ThreadDesc threadsDesc[THREADS_COUNT] = {
- {"threadRunning", 2, NULL},
- {"threadEntering", 2, NULL},
- {"threadWaiting", 2, NULL},
- {"threadSleeping", 2, NULL},
- {"threadRunningInterrupted", 2, NULL},
- {"threadRunningNative", 2, NULL}
+ { "threadRunning", 2, NULL },
+ { "threadEntering", 2, NULL },
+ { "threadWaiting", 2, NULL },
+ { "threadSleeping", 2, NULL },
+ { "threadRunningInterrupted", 2, NULL },
+ { "threadRunningNative", 2, NULL }
};
/* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t002/sp02t002.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t002/sp02t002.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -54,12 +54,12 @@
/* descriptions of tested threads */
static ThreadDesc threadsDesc[THREADS_COUNT] = {
- {"threadRunning", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION},
- {"threadEntering", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION},
- {"threadWaiting", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION},
- {"threadSleeping", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION},
- {"threadRunningInterrupted", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION},
- {"threadRunningNative", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION}
+ { "threadRunning", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION },
+ { "threadEntering", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION },
+ { "threadWaiting", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION },
+ { "threadSleeping", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION },
+ { "threadRunningInterrupted", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION },
+ { "threadRunningNative", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION }
};
/* indexes of known threads */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -54,12 +54,12 @@
/* descriptions of tested threads */
static ThreadDesc threadsDesc[THREADS_COUNT] = {
- {"threadRunning", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION},
- {"threadEntering", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION},
- {"threadWaiting", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION},
- {"threadSleeping", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION},
- {"threadRunningInterrupted", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION},
- {"threadRunningNative", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION}
+ { "threadRunning", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION },
+ { "threadEntering", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION },
+ { "threadWaiting", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION },
+ { "threadSleeping", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION },
+ { "threadRunningInterrupted", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION },
+ { "threadRunningNative", "testedMethod", "()V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION }
};
/* indexes of known threads */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t001/sp06t001.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t001/sp06t001.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -62,12 +62,12 @@
/* descriptions of tested threads */
static ThreadDesc threadsDesc[THREADS_COUNT] = {
- {"threadRunning", "testedMethod", "(ZI)V", 2, NULL, NULL, NULL, NSK_FALSE},
- {"threadEntering", "testedMethod", "(ZI)V", 2, NULL, NULL, NULL, NSK_FALSE},
- {"threadWaiting", "testedMethod", "(ZI)V", 2, NULL, NULL, NULL, NSK_FALSE},
- {"threadSleeping", "testedMethod", "(ZI)V", 2, NULL, NULL, NULL, NSK_FALSE},
- {"threadRunningInterrupted", "testedMethod", "(ZI)V", 2, NULL, NULL, NULL, NSK_FALSE},
- {"threadRunningNative", "testedMethod", "(ZI)V", 2, NULL, NULL, NULL, NSK_FALSE}
+ { "threadRunning", "testedMethod", "(ZI)V", 2, NULL, NULL, NULL, NSK_FALSE },
+ { "threadEntering", "testedMethod", "(ZI)V", 2, NULL, NULL, NULL, NSK_FALSE },
+ { "threadWaiting", "testedMethod", "(ZI)V", 2, NULL, NULL, NULL, NSK_FALSE },
+ { "threadSleeping", "testedMethod", "(ZI)V", 2, NULL, NULL, NULL, NSK_FALSE },
+ { "threadRunningInterrupted", "testedMethod", "(ZI)V", 2, NULL, NULL, NULL, NSK_FALSE },
+ { "threadRunningNative", "testedMethod", "(ZI)V", 2, NULL, NULL, NULL, NSK_FALSE }
};
/* indexes of known threads */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t002/sp06t002.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t002/sp06t002.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -62,12 +62,12 @@
/* descriptions of tested threads */
static ThreadDesc threadsDesc[THREADS_COUNT] = {
- {"threadRunning", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE},
- {"threadEntering", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE},
- {"threadWaiting", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE},
- {"threadSleeping", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE},
- {"threadRunningInterrupted", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE},
- {"threadRunningNative", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE}
+ { "threadRunning", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE },
+ { "threadEntering", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE },
+ { "threadWaiting", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE },
+ { "threadSleeping", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE },
+ { "threadRunningInterrupted", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE },
+ { "threadRunningNative", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE }
};
/* indexes of known threads */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -62,12 +62,12 @@
/* descriptions of tested threads */
static ThreadDesc threadsDesc[THREADS_COUNT] = {
- {"threadRunning", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE},
- {"threadEntering", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE},
- {"threadWaiting", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE},
- {"threadSleeping", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE},
- {"threadRunningInterrupted", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE},
- {"threadRunningNative", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE}
+ { "threadRunning", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE },
+ { "threadEntering", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE },
+ { "threadWaiting", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE },
+ { "threadSleeping", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE },
+ { "threadRunningInterrupted", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE },
+ { "threadRunningNative", "testedMethod", "(ZI)V", NULL, NULL, NULL, NSK_JVMTI_INVALID_JLOCATION, NSK_FALSE }
};
/* indexes of known threads */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/MethodBind/JvmtiTest/JvmtiTest.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/MethodBind/JvmtiTest/JvmtiTest.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -29,8 +29,8 @@
extern "C" {
-#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res;}
-#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res;}
+#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res; }
+#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res; }
#define JVMTI_ERROR_CHECK_VOID(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); iGlobalStatus = 2; }
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/StackTrace/JvmtiTest/JvmtiTest.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/StackTrace/JvmtiTest/JvmtiTest.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -32,8 +32,8 @@
extern "C" {
-#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res;}
-#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res;}
+#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res; }
+#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res; }
#define JVMTI_ERROR_CHECK_VOID(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); iGlobalStatus = 2; }
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/AddToBootstrapClassLoaderSearch/JvmtiTest/JvmtiTest.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/AddToBootstrapClassLoaderSearch/JvmtiTest/JvmtiTest.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -29,8 +29,8 @@
extern "C" {
-#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res;}
-#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res;}
+#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res; }
+#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res; }
#define JVMTI_ERROR_CHECK_VOID(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); iGlobalStatus = 2; }
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/Dispose/JvmtiTest/JvmtiTest.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/Dispose/JvmtiTest/JvmtiTest.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -29,8 +29,8 @@
extern "C" {
-#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf(" %d\n",res); return res;}
-#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res;}
+#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf(" %d\n",res); return res; }
+#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res; }
#define JVMTI_ERROR_CHECK_VOID(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf(" %d\n",res); iGlobalStatus = 2; }
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/ForceGarbageCollection/gc/gc.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/ForceGarbageCollection/gc/gc.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -29,7 +29,7 @@
extern "C" {
-#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res;}
+#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res; }
#define JVMTI_ERROR_CHECK_VOID(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); iGlobalStatus = 2; }
#define THREADS_LIMIT 8
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/environment/JvmtiTest/JvmtiTest.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/environment/JvmtiTest/JvmtiTest.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -29,8 +29,8 @@
extern "C" {
-#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res;}
-#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res;}
+#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res; }
+#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res; }
#define JVMTI_ERROR_CHECK_VOID(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); iGlobalStatus = 2; }
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/nosuspendMonitorInfo/JvmtiTest/JvmtiTest.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/nosuspendMonitorInfo/JvmtiTest/JvmtiTest.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -29,8 +29,8 @@
extern "C" {
-#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res;}
-#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res;}
+#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res; }
+#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res; }
#define JVMTI_ERROR_CHECK_VOID(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); iGlobalStatus = 2; }
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/nosuspendStackTrace/JvmtiTest/JvmtiTest.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/nosuspendStackTrace/JvmtiTest/JvmtiTest.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -28,8 +28,8 @@
extern "C" {
-#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res;}
-#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res;}
+#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res; }
+#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res; }
#define JVMTI_ERROR_CHECK_VOID(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); iGlobalStatus = 2; }
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/rawmonitor/rawmonitor.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/rawmonitor/rawmonitor.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -51,8 +51,8 @@
extern "C" {
-#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf(" %d\n",res); return res;}
-#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf(" unexpected error %d\n",res); return res;}
+#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf(" %d\n",res); return res; }
+#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf(" unexpected error %d\n",res); return res; }
#define JVMTI_ERROR_CHECK_VOID(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf(" %d\n",res); iGlobalStatus = 2; }
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/setNullVMInit/JvmtiTest/JvmtiTest.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/setNullVMInit/JvmtiTest/JvmtiTest.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -38,8 +38,8 @@
extern "C" {
-#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res;}
-#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res;}
+#define JVMTI_ERROR_CHECK(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); return res; }
+#define JVMTI_ERROR_CHECK_EXPECTED_ERROR(str,res,err) if (res != err) { printf(str); printf("unexpected error %d\n",res); return res; }
#define JVMTI_ERROR_CHECK_VOID(str,res) if (res != JVMTI_ERROR_NONE) { printf(str); printf("%d\n",res); iGlobalStatus = 2; }
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch_agent.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch_agent.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -37,7 +37,7 @@
static char segment1[3000] = "";
static char segment2[3000] = "";
-static const char* const illegal_segments[] = {"", "tmp/"};
+static const char* const illegal_segments[] = { "", "tmp/" };
jboolean use_segment2 = JNI_FALSE;
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToSystemClassLoaderSearch/systemclssearch_agent.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToSystemClassLoaderSearch/systemclssearch_agent.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -37,7 +37,7 @@
static char segment1[3000] = "";
static char segment2[3000] = "";
-static const char* const illegal_segments[] = {"", "tmp/"};
+static const char* const illegal_segments[] = { "", "tmp/" };
jboolean use_segment2 = JNI_FALSE;
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -494,7 +494,7 @@
// verification_type_info locals[number_of_locals];
// u2 number_of_stack_items;
// verification_type_info stack[number_of_stack_items];
- //}
+ // }
put_u1(FULL_FRAME);
frameOffsetDelta = get_u2();
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -42,7 +42,7 @@
static void* agentThreadArg = NULL;
-typedef enum {NEW, RUNNABLE, WAITING, SUSPENDED, TERMINATED} thread_state_t;
+typedef enum { NEW, RUNNABLE, WAITING, SUSPENDED, TERMINATED } thread_state_t;
typedef struct agent_data_t {
volatile thread_state_t thread_state;
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -43,7 +43,7 @@
int verbose;
int tracing;
int nComplains;
-} nsk_context = {NSK_FALSE, NSK_TRACE_NONE, 0};
+} nsk_context = { NSK_FALSE, NSK_TRACE_NONE, 0 };
void nsk_setVerboseMode(int verbose) {
nsk_context.verbose = verbose;
--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress003.cpp Mon Dec 03 16:44:57 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress003.cpp Mon Dec 03 19:47:37 2018 -0800
@@ -68,7 +68,7 @@
arrayArray[DOUBLE]=env->NewDoubleArray(SIZE); CE
for (i=0;i<8;i++)
- {env->SetObjectArrayElement(objectsArray,i,arrayArray[i]); CE }
+ { env->SetObjectArrayElement(objectsArray,i,arrayArray[i]); CE }
boolBuf=(jboolean *)malloc(SIZE*sizeof(jboolean));
byteBuf=(jbyte *)malloc(SIZE*sizeof(jbyte));