Skip to content

Commit

Permalink
review: resolved comments from Alex and Chris
Browse files Browse the repository at this point in the history
  • Loading branch information
@sspitsyn
sspitsyn committed Oct 16, 2024
1 parent e4e54f9 commit 3b82454
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 52 deletions.
37 changes: 15 additions & 22 deletions .../jtreg/serviceability/jvmti/events/NotifyFramePopStressTest/NotifyFramePopStressTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/**
* @test
* @summary Verifies NotifyFramePop request is cleared if JVMTI_EVENT_FRAME_POP is disabled
* @summary JVMTI FRAME_POP event is sometimes missed if NotifyFramePop is called as a method is returning
* @requires vm.jvmti
* @library /test/lib
* @compile NotifyFramePopStressTest.java
Expand All @@ -34,18 +34,6 @@

public class NotifyFramePopStressTest {
static volatile boolean done = false;
static volatile int notifyCount = 0;

static {
try {
System.loadLibrary("NotifyFramePopStressTest");
} catch (UnsatisfiedLinkError ex) {
System.err.println("Could not load NotifyFramePopStressTest library");
System.err.println("java.library.path:"
+ System.getProperty("java.library.path"));
throw ex;
}
}

public static void main(String args[]) {
if (!canGenerateFramePopEvents()) {
Expand Down Expand Up @@ -84,12 +72,14 @@ private static void sleep(long ms) {
}

private static void control(Thread thread) {
System.out.println("control has started");
int notifyCount = 0;

log("control has started");
while (!done) {
suspend(thread);
if (notifyFramePop(thread)) {
notifyCount++;
System.out.println("control incremented notifyCount to " + notifyCount);
log("control incremented notifyCount to " + notifyCount);
}
resume(thread);
int waitCount = 0;
Expand All @@ -100,13 +90,12 @@ private static void control(Thread thread) {
break;
}
}
if (waitCount > 50) {
System.out.println("About to fail. notifyCount=" + notifyCount +
" getPopCount()=" + getPopCount());
if (waitCount > 100) {
log("About to fail. notifyCount=" + notifyCount + " getPopCount()=" + getPopCount());
throw new RuntimeException("Test FAILED: Waited too long for notify: " + waitCount);
}
}
System.out.println("control has finished: " + notifyCount);
log("control has finished: " + notifyCount);
}

private native static void suspend(Thread thread);
Expand All @@ -121,16 +110,20 @@ private static void log(String msg) {
System.out.println(msg);
}

private static int fetchInt() {
private static int fetchIntFoo() {
return 13;
}

private static int fetchIntBar() {
return 33;
}

private static int foo() {
return fetchInt();
return fetchIntFoo();
}

private static int bar() {
return fetchInt();
return fetchIntBar();
}
}

54 changes: 24 additions & 30 deletions ...treg/serviceability/jvmti/events/NotifyFramePopStressTest/libNotifyFramePopStressTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,13 @@
extern "C" {
#endif

#ifndef JNI_ENV_ARG

#ifdef __cplusplus
#define JNI_ENV_ARG(x, y) y
#define JNI_ENV_PTR(x) x
#else
#define JNI_ENV_ARG(x,y) x, y
#define JNI_ENV_PTR(x) (*x)
#endif

#endif

static jvmtiEnv *jvmti = NULL;
static jvmtiEnv *jvmti = nullptr;
static jvmtiCapabilities caps;
static jvmtiEventCallbacks callbacks;
static volatile jint popCount = 0;
static char* lastNotifyMethod;
static volatile jint pop_count = 0;
static char* volatile last_notify_method;
static volatile jboolean failed = JNI_FALSE;
static jboolean seenMain = JNI_FALSE;
static jboolean failed = JNI_FALSE;

static jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved);

Expand All @@ -71,29 +59,32 @@ static void JNICALL
FramePop(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread,
jmethodID method, jboolean wasPoppedByException) {
jvmtiError err;
jclass cls = NULL;
char* csig = NULL;
char* name = NULL;
jclass cls = nullptr;
char* csig = nullptr;
char* name = nullptr;

popCount++;
pop_count++;

err =jvmti->GetMethodDeclaringClass(method, &cls);
check_jvmti_status(jni, err, "FramePop: Failed in JVMTI GetMethodDeclaringClass");

err =jvmti->GetClassSignature(cls, &csig, NULL);
err =jvmti->GetClassSignature(cls, &csig, nullptr);
check_jvmti_status(jni, err, "FramePop: Failed in JVMTI GetClassSignature");

name = get_method_name(jvmti, jni, method);
LOG("FramePop(%d) event from method: %s %s\n", popCount, csig, name);
LOG("FramePop(%d) event from method: %s %s\n", pop_count, csig, name);

if (strcmp(name, "main") != 0) { // ignore FRAME_POP for main that comes in as the test exits
if (strcmp(name, lastNotifyMethod) != 0) {
LOG("ERROR: FramePop event is for wrong method: expected %s, got %s\n", lastNotifyMethod, name);
if (strcmp(name, (char*)last_notify_method) != 0) {
LOG("ERROR: FramePop event is for wrong method: expected %s, got %s\n", last_notify_method, name);
failed = JNI_TRUE;
fatal(jni, "DBG: FramePop event in wrong method\n");
deallocate(jvmti, jni, csig);
deallocate(jvmti, jni, name);
deallocate(jvmti, jni, (void*)last_notify_method);
fatal(jni, "FramePop event in wrong method\n");
}
deallocate(jvmti, jni, lastNotifyMethod);
}
deallocate(jvmti, jni, (void*)last_notify_method);
deallocate(jvmti, jni, csig);
deallocate(jvmti, jni, name);
}
Expand All @@ -103,8 +94,8 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
jint res;
jvmtiError err;

res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti), JVMTI_VERSION_9);
if (res != JNI_OK || jvmti == NULL) {
res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_9);
if (res != JNI_OK || jvmti == nullptr) {
LOG("GetEnv(JVMTI_VERSION_9) failedL error(%d)", res);
return JNI_ERR;
}
Expand Down Expand Up @@ -157,6 +148,7 @@ Java_NotifyFramePopStressTest_notifyFramePop(JNIEnv *jni, jclass cls, jthread th
isMain = (strcmp(name, "main") == 0);
if (isMain) {
if (seenMain) {
deallocate(jvmti, jni, name);
return JNI_FALSE; // Only do NotifyFramePop once for main()
} else {
seenMain = JNI_TRUE;
Expand All @@ -165,6 +157,8 @@ Java_NotifyFramePopStressTest_notifyFramePop(JNIEnv *jni, jclass cls, jthread th

err= jvmti->NotifyFramePop(thread, 0);
if (err == JVMTI_ERROR_OPAQUE_FRAME || err == JVMTI_ERROR_DUPLICATE) {
LOG("\nNotifyFramePop for method %d returned acceptable error: %s\n", name, TranslateError(err));
deallocate(jvmti, jni, name);
return JNI_FALSE;
}
check_jvmti_status(jni, err, "notifyFramePop: Failed in JVMTI notifyFramePop");
Expand All @@ -175,7 +169,7 @@ Java_NotifyFramePopStressTest_notifyFramePop(JNIEnv *jni, jclass cls, jthread th
deallocate(jvmti, jni, name);
return JNI_FALSE;
} else {
lastNotifyMethod = name;
last_notify_method = name;
return JNI_TRUE;
}
}
Expand All @@ -192,7 +186,7 @@ Java_NotifyFramePopStressTest_resume(JNIEnv *jni, jclass cls, jthread thread) {

JNIEXPORT jint JNICALL
Java_NotifyFramePopStressTest_getPopCount(JNIEnv *env, jclass cls) {
return popCount;
return pop_count;
}

JNIEXPORT jboolean JNICALL
Expand Down

0 comments on commit 3b82454

Please sign in to comment.