< prev index next >

test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001a.cpp

Print this page
rev 52100 : 8212082: Remove the NSK_CPP_STUB macros for remaining vmTestbase/jvmti/[sS]*
Summary:
Reviewed-by:

*** 52,97 **** jclass klass = NULL; char *signature = NULL; ExceptionEventsCount++; ! if (!NSK_JNI_VERIFY(jni_env, (klass = ! NSK_CPP_STUB2(GetObjectClass, jni_env, exception)) != NULL)) { nsk_jvmti_setFailStatus(); return; } ! if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti_env, ! klass, &signature, NULL))) { nsk_jvmti_setFailStatus(); return; } NSK_DISPLAY1("Exception event: %s\n", signature); if (signature != NULL) ! NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature); } void JNICALL ExceptionCatch(jvmtiEnv *jvmti_env, JNIEnv *jni_env, jthread thread, jmethodID method, jlocation location, jobject exception) { jclass klass = NULL; char *signature = NULL; ExceptionCatchEventsCount++; ! if (!NSK_JNI_VERIFY(jni_env, (klass = ! NSK_CPP_STUB2(GetObjectClass, jni_env, exception)) != NULL)) { nsk_jvmti_setFailStatus(); return; } ! if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti_env, ! klass, &signature, NULL))) { nsk_jvmti_setFailStatus(); return; } NSK_DISPLAY1("ExceptionCatch event: %s\n", signature); if (signature != NULL) ! NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature); } /* ========================================================================== */ /** Agent algorithm. */ --- 52,93 ---- jclass klass = NULL; char *signature = NULL; ExceptionEventsCount++; ! if (!NSK_JNI_VERIFY(jni_env, (klass = jni_env->GetObjectClass(exception)) != NULL)) { nsk_jvmti_setFailStatus(); return; } ! if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(klass, &signature, NULL))) { nsk_jvmti_setFailStatus(); return; } NSK_DISPLAY1("Exception event: %s\n", signature); if (signature != NULL) ! jvmti_env->Deallocate((unsigned char*)signature); } void JNICALL ExceptionCatch(jvmtiEnv *jvmti_env, JNIEnv *jni_env, jthread thread, jmethodID method, jlocation location, jobject exception) { jclass klass = NULL; char *signature = NULL; ExceptionCatchEventsCount++; ! if (!NSK_JNI_VERIFY(jni_env, (klass = jni_env->GetObjectClass(exception)) != NULL)) { nsk_jvmti_setFailStatus(); return; } ! if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(klass, &signature, NULL))) { nsk_jvmti_setFailStatus(); return; } NSK_DISPLAY1("ExceptionCatch event: %s\n", signature); if (signature != NULL) ! jvmti_env->Deallocate((unsigned char*)signature); } /* ========================================================================== */ /** Agent algorithm. */
*** 154,164 **** if (!NSK_VERIFY(nsk_jvmti_setAgentProc(agentProc, NULL))) return JNI_ERR; memset(&caps, 0, sizeof(caps)); caps.can_generate_exception_events = 1; ! if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { return JNI_ERR; } memset(&callbacks, 0, sizeof(callbacks)); callbacks.Exception = &Exception; --- 150,160 ---- if (!NSK_VERIFY(nsk_jvmti_setAgentProc(agentProc, NULL))) return JNI_ERR; memset(&caps, 0, sizeof(caps)); caps.can_generate_exception_events = 1; ! if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } memset(&callbacks, 0, sizeof(callbacks)); callbacks.Exception = &Exception;
< prev index next >