< prev index next >

test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/nosuspendStackTrace/JvmtiTest/JvmtiTest.cpp

Print this page
rev 51722 : 8210700: Clean up JNI_ENV_ARG and factorize the macros for vmTestbase/jvmti/unit tests
Summary:
Reviewed-by:

*** 24,54 **** #include <stdio.h> #include <string.h> #include "jvmti.h" #include "agent_common.h" - #ifdef __cplusplus extern "C" { - #endif - - #ifndef JNI_ENV_ARG - - #ifdef __cplusplus - #define JNI_ENV_ARG(x, y) y - #define JNI_ENV_ARG1(x) - #define JNI_ENV_PTR(x) x - #else - #define JNI_ENV_ARG(x,y) x, y - #define JNI_ENV_ARG1(x) x - #define JNI_ENV_PTR(x) (*x) - #endif - - #endif - - #define JVMTI_ENV_ARG JNI_ENV_ARG - #define JVMTI_ENV_ARG1 JNI_ENV_ARG1 - #define JVMTI_ENV_PTR JNI_ENV_PTR #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; } --- 24,34 ----
*** 132,165 **** if (strstr(options, "printdump")) { printdump = 1; } } ! res = JNI_ENV_PTR(jvm)-> ! GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti), JVMTI_VERSION_1_1); if (res < 0) { debug_printf("Wrong result of a valid call to GetEnv!\n"); return JNI_ERR; } /* Add capabilities */ ! res = JVMTI_ENV_PTR(jvmti)->GetPotentialCapabilities(JVMTI_ENV_ARG(jvmti, &jvmti_caps)); JVMTI_ERROR_CHECK("GetPotentialCapabilities returned error", res); ! res = JVMTI_ENV_PTR(jvmti)->AddCapabilities(JVMTI_ENV_ARG(jvmti, &jvmti_caps)); JVMTI_ERROR_CHECK("GetPotentialCapabilities returned error", res); /* Enable events */ init_callbacks(); ! res = JVMTI_ENV_PTR(jvmti)->SetEventCallbacks(JVMTI_ENV_ARG(jvmti, &callbacks), sizeof(callbacks)); JVMTI_ERROR_CHECK("SetEventCallbacks returned error", res); ! res = JVMTI_ENV_PTR(jvmti)->SetEventNotificationMode(JVMTI_ENV_ARG(jvmti,JVMTI_ENABLE),JVMTI_EVENT_VM_INIT,NULL); JVMTI_ERROR_CHECK("SetEventNotificationMode for VM_INIT returned error", res); ! res = JVMTI_ENV_PTR(jvmti)->SetEventNotificationMode(JVMTI_ENV_ARG(jvmti,JVMTI_ENABLE),JVMTI_EVENT_VM_DEATH,NULL); JVMTI_ERROR_CHECK("SetEventNotificationMode for vm death event returned error", res); return JNI_OK; } --- 112,144 ---- if (strstr(options, "printdump")) { printdump = 1; } } ! res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1); if (res < 0) { debug_printf("Wrong result of a valid call to GetEnv!\n"); return JNI_ERR; } /* Add capabilities */ ! res = jvmti->GetPotentialCapabilities(&jvmti_caps); JVMTI_ERROR_CHECK("GetPotentialCapabilities returned error", res); ! res = jvmti->AddCapabilities(&jvmti_caps); JVMTI_ERROR_CHECK("GetPotentialCapabilities returned error", res); /* Enable events */ init_callbacks(); ! res = jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)); JVMTI_ERROR_CHECK("SetEventCallbacks returned error", res); ! res = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_INIT, NULL); JVMTI_ERROR_CHECK("SetEventNotificationMode for VM_INIT returned error", res); ! res = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL); JVMTI_ERROR_CHECK("SetEventNotificationMode for vm death event returned error", res); return JNI_OK; }
*** 175,185 **** jvmtiError ret; char sz[128]; sprintf(sz, "Rawmonitor-%d",i); debug_printf("jvmti create raw monitor \n"); ! ret = JVMTI_ENV_PTR(jvmti)->CreateRawMonitor(JVMTI_ENV_ARG(jvmti, sz), &jraw_monitor[i]); if (ret != JVMTI_ERROR_NONE) { printf("Error: ForceGarbageCollection %d \n", ret); iGlobalStatus = 2; } --- 154,164 ---- jvmtiError ret; char sz[128]; sprintf(sz, "Rawmonitor-%d",i); debug_printf("jvmti create raw monitor \n"); ! ret = jvmti->CreateRawMonitor(sz, &jraw_monitor[i]); if (ret != JVMTI_ERROR_NONE) { printf("Error: ForceGarbageCollection %d \n", ret); iGlobalStatus = 2; }
*** 188,198 **** JNIEXPORT void JNICALL Java_nsk_jvmti_unit_functions_nosuspendStackTrace_JvmtiTest_RawMonitorEnter(JNIEnv * env, jclass cls, jint i) { jvmtiError ret; debug_printf("jvmti Raw monitor enter \n"); ! ret = JVMTI_ENV_PTR(jvmti)->RawMonitorEnter(JVMTI_ENV_ARG(jvmti, jraw_monitor[i])); if (ret != JVMTI_ERROR_NONE) { printf("Error: Raw monitor enter %d \n", ret); iGlobalStatus = 2; } --- 167,177 ---- JNIEXPORT void JNICALL Java_nsk_jvmti_unit_functions_nosuspendStackTrace_JvmtiTest_RawMonitorEnter(JNIEnv * env, jclass cls, jint i) { jvmtiError ret; debug_printf("jvmti Raw monitor enter \n"); ! ret = jvmti->RawMonitorEnter(jraw_monitor[i]); if (ret != JVMTI_ERROR_NONE) { printf("Error: Raw monitor enter %d \n", ret); iGlobalStatus = 2; }
*** 201,211 **** JNIEXPORT void JNICALL Java_nsk_jvmti_unit_functions_nosuspendStackTrace_JvmtiTest_RawMonitorExit(JNIEnv * env, jclass cls, jint i) { jvmtiError ret; debug_printf("jvmti raw monitor exit \n"); ! ret = JVMTI_ENV_PTR(jvmti)->RawMonitorExit(JVMTI_ENV_ARG(jvmti, jraw_monitor[i])); if (ret != JVMTI_ERROR_NONE) { printf("Error: RawMonitorExit %d \n", ret); iGlobalStatus = 2; } --- 180,190 ---- JNIEXPORT void JNICALL Java_nsk_jvmti_unit_functions_nosuspendStackTrace_JvmtiTest_RawMonitorExit(JNIEnv * env, jclass cls, jint i) { jvmtiError ret; debug_printf("jvmti raw monitor exit \n"); ! ret = jvmti->RawMonitorExit(jraw_monitor[i]); if (ret != JVMTI_ERROR_NONE) { printf("Error: RawMonitorExit %d \n", ret); iGlobalStatus = 2; }
*** 214,224 **** JNIEXPORT void JNICALL Java_nsk_jvmti_unit_functions_nosuspendStackTrace_JvmtiTest_RawMonitorWait(JNIEnv * env, jclass cls, jint i) { jvmtiError ret; debug_printf("jvmti RawMonitorWait \n"); ! ret = JVMTI_ENV_PTR(jvmti)->RawMonitorWait(JVMTI_ENV_ARG(jvmti,jraw_monitor[i]),-1); if (ret != JVMTI_ERROR_NONE) { printf("Error: RawMonitorWait %d \n", ret); iGlobalStatus = 2; } --- 193,203 ---- JNIEXPORT void JNICALL Java_nsk_jvmti_unit_functions_nosuspendStackTrace_JvmtiTest_RawMonitorWait(JNIEnv * env, jclass cls, jint i) { jvmtiError ret; debug_printf("jvmti RawMonitorWait \n"); ! ret = jvmti->RawMonitorWait(jraw_monitor[i], -1); if (ret != JVMTI_ERROR_NONE) { printf("Error: RawMonitorWait %d \n", ret); iGlobalStatus = 2; }
*** 227,237 **** JNIEXPORT void JNICALL Java_nsk_jvmti_unit_functions_nosuspendStackTrace_JvmtiTest_RawMonitorNotify(JNIEnv * env, jclass cls, jint i) { jvmtiError ret; debug_printf("jvmti RawMonitorNotify \n"); ! ret = JVMTI_ENV_PTR(jvmti)->RawMonitorNotifyAll(JVMTI_ENV_ARG(jvmti,jraw_monitor[i])); if (ret != JVMTI_ERROR_NONE) { printf("Error: RawMonitorNotify %d \n", ret); iGlobalStatus = 2; } --- 206,216 ---- JNIEXPORT void JNICALL Java_nsk_jvmti_unit_functions_nosuspendStackTrace_JvmtiTest_RawMonitorNotify(JNIEnv * env, jclass cls, jint i) { jvmtiError ret; debug_printf("jvmti RawMonitorNotify \n"); ! ret = jvmti->RawMonitorNotifyAll(jraw_monitor[i]); if (ret != JVMTI_ERROR_NONE) { printf("Error: RawMonitorNotify %d \n", ret); iGlobalStatus = 2; }
*** 241,251 **** Java_nsk_jvmti_unit_functions_nosuspendStackTrace_JvmtiTest_GetFrameCount(JNIEnv * env, jclass cls, jobject thr) { jvmtiError ret; jint count; debug_printf("jvmti GetFrameCount \n"); ! ret = JVMTI_ENV_PTR(jvmti)->GetFrameCount(JVMTI_ENV_ARG(jvmti, (jthread)thr), &count); if (ret != JVMTI_ERROR_NONE) { printf("Error: GetFrameCount returned %d \n", ret); iGlobalStatus = 2; } return count; --- 220,230 ---- Java_nsk_jvmti_unit_functions_nosuspendStackTrace_JvmtiTest_GetFrameCount(JNIEnv * env, jclass cls, jobject thr) { jvmtiError ret; jint count; debug_printf("jvmti GetFrameCount \n"); ! ret = jvmti->GetFrameCount((jthread) thr, &count); if (ret != JVMTI_ERROR_NONE) { printf("Error: GetFrameCount returned %d \n", ret); iGlobalStatus = 2; } return count;
*** 264,305 **** int i; debug_printf("jvmti GetStackTrace \n"); ! ret = JVMTI_ENV_PTR(jvmti)->Allocate(JVMTI_ENV_ARG(jvmti, sizeof(jvmtiFrameInfo) * count), (unsigned char**)&stack_buffer); if (ret != JVMTI_ERROR_NONE) { printf("Error: Allocate failed with %d \n", ret); iGlobalStatus = 2; } ! ret = JVMTI_ENV_PTR(jvmti)->GetStackTrace(JVMTI_ENV_ARG(jvmti, thr), 0, count , stack_buffer, &count); if (ret != JVMTI_ERROR_NONE) { printf("Error: GetStackTrace %d \n", ret); iGlobalStatus = 2; } debug_printf(" Java Stack trace ---\n"); for (i = 0; i < count; i++) { ! ret = JVMTI_ENV_PTR(jvmti)->GetMethodDeclaringClass(JVMTI_ENV_ARG(jvmti, stack_buffer[i].method), &klass); if (ret != JVMTI_ERROR_NONE) { printf("Error: GetMethodDeclaringClass %d \n", ret); iGlobalStatus = 2; return; } ! ret = JVMTI_ENV_PTR(jvmti)->GetClassSignature(JVMTI_ENV_ARG(jvmti, klass), &clname, &generic); if (ret != JVMTI_ERROR_NONE) { printf("Error: GetMethodDeclaringClass %d \n", ret); iGlobalStatus = 2; return; } ! ret = JVMTI_ENV_PTR(jvmti)->GetMethodName(JVMTI_ENV_ARG(jvmti, stack_buffer[i].method), &mname, &signature, &generic); if (ret != JVMTI_ERROR_NONE) { printf("Error: GetMethodDeclaringClass %d \n", ret); iGlobalStatus = 2; return; } --- 243,284 ---- int i; debug_printf("jvmti GetStackTrace \n"); ! ret = jvmti->Allocate(sizeof(jvmtiFrameInfo) * count, (unsigned char**)&stack_buffer); if (ret != JVMTI_ERROR_NONE) { printf("Error: Allocate failed with %d \n", ret); iGlobalStatus = 2; } ! ret = jvmti->GetStackTrace(thr, 0, count, stack_buffer, &count); if (ret != JVMTI_ERROR_NONE) { printf("Error: GetStackTrace %d \n", ret); iGlobalStatus = 2; } debug_printf(" Java Stack trace ---\n"); for (i = 0; i < count; i++) { ! ret = jvmti->GetMethodDeclaringClass(stack_buffer[i].method, &klass); if (ret != JVMTI_ERROR_NONE) { printf("Error: GetMethodDeclaringClass %d \n", ret); iGlobalStatus = 2; return; } ! ret = jvmti->GetClassSignature(klass, &clname, &generic); if (ret != JVMTI_ERROR_NONE) { printf("Error: GetMethodDeclaringClass %d \n", ret); iGlobalStatus = 2; return; } ! ret = jvmti->GetMethodName(stack_buffer[i].method, &mname, &signature, &generic); if (ret != JVMTI_ERROR_NONE) { printf("Error: GetMethodDeclaringClass %d \n", ret); iGlobalStatus = 2; return; }
*** 308,318 **** } ! ret = JVMTI_ENV_PTR(jvmti)->Deallocate(JVMTI_ENV_ARG(jvmti, (unsigned char *)stack_buffer)); if (ret != JVMTI_ERROR_NONE) { printf("Error: Deallocate failed with %d \n", ret); iGlobalStatus = 2; } --- 287,297 ---- } ! ret = jvmti->Deallocate((unsigned char *) stack_buffer); if (ret != JVMTI_ERROR_NONE) { printf("Error: Deallocate failed with %d \n", ret); iGlobalStatus = 2; }
*** 322,329 **** JNIEXPORT void JNICALL Java_nsk_jvmti_unit_functions_nosuspendStackTrace_JvmtiTest_SaveThreadInfo(JNIEnv * env, jclass cls, jobject oobj) { } - #ifdef __cplusplus } - #endif --- 301,306 ----
< prev index next >