< prev index next >

test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/share/IndyRedefineClass.cpp

Print this page
rev 52185 : [mq]: refactor

*** 86,111 **** return; if ( tls->countOfFramesToPop <= 0 ) { NSK_DISPLAY0("Disabling single step\n"); ! if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, jvmti_env, JVMTI_DISABLE, JVMTI_EVENT_SINGLE_STEP, NULL)) ) gIsErrorOccured = JNI_TRUE; } else { NSK_DISPLAY0("Enabling single step\n"); ! if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, jvmti_env, JVMTI_ENABLE, JVMTI_EVENT_SINGLE_STEP, NULL)) ) gIsErrorOccured = JNI_TRUE; if ( tls->countOfFramesToPop == 1 ) { NSK_DISPLAY0("Popping a frame\n"); ! if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB2(PopFrame, jvmti_env, thread)) ) gIsErrorOccured = JNI_TRUE; } else { NSK_DISPLAY0("Forcing early return\n"); ! if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB2(ForceEarlyReturnVoid, jvmti_env, thread)) ) gIsErrorOccured = JNI_TRUE; } --tls->countOfFramesToPop; } --- 86,111 ---- return; if ( tls->countOfFramesToPop <= 0 ) { NSK_DISPLAY0("Disabling single step\n"); ! if ( ! NSK_JVMTI_VERIFY(jvmti_env->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_SINGLE_STEP, NULL)) ) gIsErrorOccured = JNI_TRUE; } else { NSK_DISPLAY0("Enabling single step\n"); ! if ( ! NSK_JVMTI_VERIFY(jvmti_env->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_SINGLE_STEP, NULL)) ) gIsErrorOccured = JNI_TRUE; if ( tls->countOfFramesToPop == 1 ) { NSK_DISPLAY0("Popping a frame\n"); ! if ( ! NSK_JVMTI_VERIFY(jvmti_env->PopFrame(thread)) ) gIsErrorOccured = JNI_TRUE; } else { NSK_DISPLAY0("Forcing early return\n"); ! if ( ! NSK_JVMTI_VERIFY(jvmti_env->ForceEarlyReturnVoid(thread)) ) gIsErrorOccured = JNI_TRUE; } --tls->countOfFramesToPop; }
*** 139,149 **** return; } NSK_DISPLAY1("Redefining class %s\n", gszRedefinedClassFileName); ! if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetMethodDeclaringClass, jvmti_env, method, &clazz)) ) return; if ( ! NSK_VERIFY(nsk_jvmti_redefineClass(jvmti_env, clazz, gszRedefinedClassFileName)) ) { gIsErrorOccured = JNI_TRUE; return; --- 139,149 ---- return; } NSK_DISPLAY1("Redefining class %s\n", gszRedefinedClassFileName); ! if ( ! NSK_JVMTI_VERIFY(jvmti_env->GetMethodDeclaringClass(method, &clazz)) ) return; if ( ! NSK_VERIFY(nsk_jvmti_redefineClass(jvmti_env, clazz, gszRedefinedClassFileName)) ) { gIsErrorOccured = JNI_TRUE; return;
*** 198,221 **** caps.can_generate_single_step_events = 1; caps.can_pop_frame = 1; caps.can_force_early_return = 1; caps.can_redefine_classes = 1; ! if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, gJvmtiEnv, &caps)) ) return JNI_ERR; memset(&callbacks, 0, sizeof(callbacks)); callbacks.MethodEntry = &MethodEntry; callbacks.SingleStep = &SingleStep; ! if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, gJvmtiEnv, &callbacks, sizeof(callbacks))) ) return JNI_ERR; ! if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, gJvmtiEnv, JVMTI_ENABLE, JVMTI_EVENT_METHOD_ENTRY, NULL) ) ) return JNI_ERR; ! if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, gJvmtiEnv, JVMTI_DISABLE, JVMTI_EVENT_SINGLE_STEP, NULL) ) ) return JNI_ERR; return JNI_OK; } --- 198,221 ---- caps.can_generate_single_step_events = 1; caps.can_pop_frame = 1; caps.can_force_early_return = 1; caps.can_redefine_classes = 1; ! if ( ! NSK_JVMTI_VERIFY(gJvmtiEnv->AddCapabilities(&caps)) ) return JNI_ERR; memset(&callbacks, 0, sizeof(callbacks)); callbacks.MethodEntry = &MethodEntry; callbacks.SingleStep = &SingleStep; ! if ( ! NSK_JVMTI_VERIFY(gJvmtiEnv->SetEventCallbacks(&callbacks, sizeof(callbacks))) ) return JNI_ERR; ! if ( ! NSK_JVMTI_VERIFY(gJvmtiEnv->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_METHOD_ENTRY, NULL) ) ) return JNI_ERR; ! if ( ! NSK_JVMTI_VERIFY(gJvmtiEnv->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_SINGLE_STEP, NULL) ) ) return JNI_ERR; return JNI_OK; }
< prev index next >