stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8208207: Test nsk/stress/jni/gclocker/gcl001 fails after co-location

Browse Source 
Reviewed-by: tschatzl
This commit is contained in:
Igor Ignatyev 2020-07-02 08:05:00 -07:00
parent a4b135316c
commit 72ae322022
2 changed files with 63 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/hotspot/jtreg/vmTestbase/nsk/stress/jni/gclocker/gcl001.java
View File

@ -24,11 +24,10 @@
/*
* @test
* @key stress
* @key stress randomness
*
* @summary converted from VM testbase nsk/stress/jni/gclocker/gcl001.
* VM testbase keywords: [stress, quick, feature_283, nonconcurrent, exclude]
* VM testbase comments: 8208207
* VM testbase keywords: [stress, quick, feature_283, nonconcurrent]
* VM testbase readme:
* DESCRIPTION
* Check compatibility of GC Locker improvements with JNI CS
@ -37,9 +36,8 @@
* 1. Create primitive array and string with random data
* 2. Pass it to native method
* 3. Sort/Hash data in JNI CS mixing string and array critical sections
* 4. Check isCopy == false
* 5. Return from native
* 6. Check data to be processed correctly
* 4. Return from native
* 5. Check data to be processed correctly
* B) Create M ' Garbage producer/memory allocation' threads. Each of them will:
* 1. Allocate memory blocks and make them garbage.
* 2. Check for OOM errors.
@ -47,7 +45,6 @@
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @ignore 8208207
* @run main/othervm/native/timeout=480
* -XX:-UseGCOverheadLimit
* nsk.stress.jni.gclocker.gcl001
@ -228,6 +225,7 @@ public class gcl001 extends ThreadedGCTest {
for (int i = 0; i < str.length(); ++i) {
javaHash += (int) str.charAt(i);
}
javaHash += javaHash;
check(array[0] == false && array[array.length - 1] == true
&& javaHash == nativeHash, "Data validation failure");
@ -261,7 +259,7 @@ public class gcl001 extends ThreadedGCTest {
for (int i = 0; i < str.length(); ++i) {
javaHash += (int) str.charAt(i);
}
javaHash += javaHash;
check(array[0] == min && array[array.length - 1] == max
&& javaHash == nativeHash, "Data validation failure");
@ -296,7 +294,7 @@ public class gcl001 extends ThreadedGCTest {
for (int i = 0; i < str.length(); ++i) {
javaHash += (int) str.charAt(i);
}
javaHash += javaHash;
check(array[0] == min && array[array.length - 1] == max
&& javaHash == nativeHash, "Data validation failure");
@ -331,7 +329,7 @@ public class gcl001 extends ThreadedGCTest {
for (int i = 0; i < str.length(); ++i) {
javaHash += (int) str.charAt(i);
}
javaHash += javaHash;
check(array[0] == min && array[array.length - 1] == max
&& javaHash == nativeHash, "Data validation failure");
}
@ -364,7 +362,7 @@ public class gcl001 extends ThreadedGCTest {
for (int i = 0; i < str.length(); ++i) {
javaHash += (int) str.charAt(i);
}
javaHash += javaHash;
check(array[0] == min && array[array.length - 1] == max
&& javaHash == nativeHash, "Data validation failure");
@ -399,7 +397,7 @@ public class gcl001 extends ThreadedGCTest {
for (int i = 0; i < str.length(); ++i) {
javaHash += (int) str.charAt(i);
}
javaHash += javaHash;
check(array[0] == min && array[array.length - 1] == max
&& javaHash == nativeHash, "Data validation failure");
@ -434,7 +432,7 @@ public class gcl001 extends ThreadedGCTest {
for (int i = 0; i < str.length(); ++i) {
javaHash += (int) str.charAt(i);
}
javaHash += javaHash;
check(array[0] == min && array[array.length - 1] == max
&& javaHash == nativeHash, "Data validation failure");
}
@ -468,7 +466,7 @@ public class gcl001 extends ThreadedGCTest {
for (int i = 0; i < str.length(); ++i) {
javaHash += (int) str.charAt(i);
}
javaHash += javaHash;
check(array[0] == min && array[array.length - 1] == max
&& javaHash == nativeHash, "Data validation failure");
}

127
test/hotspot/jtreg/vmTestbase/nsk/stress/jni/gclocker/libgcl001.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -20,87 +20,60 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
#include <jni.h>
#include <stdlib.h>
#include "jnihelper.h"
extern "C" {
/*
basic routine: provide critical sections and calculations
enter array CS
enter first string CS
leave first string CS
enter second string CS
leave array CS
leave second string CS
*/
#define BODY(type) \
int hash = 0; \
jsize i, arraySize, stringSize; \
jchar *nativeStr = NULL; \
type *nativeArray = NULL; \
\
arraySize = env->GetArrayLength(array); CE \
stringSize = env->GetStringLength(str); CE \
\
nativeArray = (type *)env->GetPrimitiveArrayCritical(array, NULL); CE \
qsort(nativeArray, arraySize, sizeof(type), *type##comp); \
\
nativeStr = (jchar *)env->GetStringCritical(str, NULL); CE \
\
for (i = 0; i < stringSize; ++i) \
hash += (int)nativeStr[i]; \
env->ReleaseStringCritical(str, nativeStr); CE \
\
nativeStr = (jchar *)env->GetStringCritical(str, NULL); CE \
\
env->ReleasePrimitiveArrayCritical(array, nativeArray, 0); CE \
\
for (i = 0; i < stringSize; ++i) \
hash += (int)nativeStr[i]; \
env->ReleaseStringCritical(str, nativeStr); CE \
\
return hash;
// compare most java primitive value types
#define COMP(type) \
int type##comp(const void *s1, const void *s2)\
{\
type st1 = *((type *)s1);\
type st2 = *((type *)s2);\
if (st1 < st2)\
return -1;\
else if (st1 > st2)\
return 1;\
else\
return 0;\
}
// basic routine: provide critical sections and calculations
// enter array CS
// check isCopy for native referencing
// enter first string CS
// leave first string CS
// enter second string CS
// leave array CS
// enter second string CS
#define BODY(type) \
int hash = 0; int i; jboolean isCopy = JNI_FALSE; jchar *nativeStr; jsize size; type *nativeArray; \
size = env->GetArrayLength(array); CE \
nativeArray = (type *)env->GetPrimitiveArrayCritical(array, &isCopy); CE \
EnterCS(env); \
if (isCopy == JNI_TRUE) return 0;\
qsort(nativeArray, size, sizeof(type), *type##comp);\
\
size = env->GetStringLength(str); CE \
nativeStr = (jchar *)env->GetStringCritical(str, &isCopy); CE \
if (isCopy == JNI_TRUE) return 0;\
for (i = 0; i < size; ++i)\
hash += (int)nativeStr[i];\
\
env->ReleasePrimitiveArrayCritical(array, nativeArray, 0); CE \
LeaveCS(env); \
env->ReleaseStringCritical(str, nativeStr); CE \
\
hash = 0;\
size = env->GetStringLength(str); CE \
nativeStr = (jchar *)env->GetStringCritical(str, &isCopy); CE \
EnterCS(env); \
if (isCopy == JNI_TRUE) return 0;\
for (i = 0; i < size; ++i)\
hash += (int)nativeStr[i];\
LeaveCS(env); \
env->ReleaseStringCritical(str, nativeStr); CE \
return hash;
static int CSEntered = 0;
static int CSLeft = 0;
void EnterCS(JNIEnv *env)
{
// unsafe but where are no better ideas
//++CSEntered;
//printf("CS Entered -> Entered: %d\n", CSEntered);
// jclass trace = 0; jmethodID method = 0;
// trace = env->FindClass("nsk/stress/jni/gclocker/Trace"); CE
// method = env->GetStaticMethodID(trace, "EnterCS", "()V"); CE
// env->CallStaticVoidMethod(trace, method); CE
}
void LeaveCS(JNIEnv *env)
{
// unsafe but where are no better ideas
//++CSLeft;
//printf("CS Left -> Completed: %d\tActive: %d\n", CSLeft, CSEntered - CSLeft);
// jclass trace = 0; jmethodID method = 0;
// trace = env->FindClass("nsk/stress/jni/gclocker/Trace"); CE
// method = env->GetStaticMethodID(trace, "LeaveCS", "()V"); CE
// env->CallStaticVoidMethod(trace, method); CE
#define COMP(type) \
int type##comp(const void *s1, const void *s2) \
{ \
type st1 = *((type *)s1); \
type st2 = *((type *)s2); \
if (st1 < st2) \
return -1; \
else if (st1 > st2) \
return 1; \
else \
return 0; \
}
COMP(jint)
@ -112,6 +85,8 @@ COMP(jdouble)
COMP(jfloat)
COMP(jlong)
extern "C" {
/*
* Class: JNIWorker
* Method: NativeCall