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

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,35 ----
*** 97,135 ****
          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("GetAddCapabilities returned error", res);
  
  
!     res = JVMTI_ENV_PTR(jvmti)->GetSystemProperties(JVMTI_ENV_ARG(jvmti, &count), &properties);
  
      JVMTI_ERROR_CHECK("GetSystemProperties returned error", res);
  
      for (i=0; i< count; i++) {
          char *value;
  
!         res = JVMTI_ENV_PTR(jvmti)->GetSystemProperty(JVMTI_ENV_ARG(jvmti, (const char *)properties[i]), &value);
          JVMTI_ERROR_CHECK("GetSystemProperty returned error", res);
          debug_printf(" %s    %s \n", properties[i], value);
  
          /* Only writeable properties returns JVMTI_ERROR_NONE. */
!         res = JVMTI_ENV_PTR(jvmti)->SetSystemProperty(JVMTI_ENV_ARG(jvmti, (const char *)properties[i]), value);
          debug_printf("SetSystemProperty returned error %d\n", res);
  
       }
  
      return JNI_OK;
--- 78,115 ----
          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("GetAddCapabilities returned error", res);
  
  
!     res = jvmti->GetSystemProperties(&count, &properties);
  
      JVMTI_ERROR_CHECK("GetSystemProperties returned error", res);
  
      for (i=0; i< count; i++) {
          char *value;
  
!         res = jvmti->GetSystemProperty((const char *) properties[i], &value);
          JVMTI_ERROR_CHECK("GetSystemProperty returned error", res);
          debug_printf(" %s    %s \n", properties[i], value);
  
          /* Only writeable properties returns JVMTI_ERROR_NONE. */
!         res = jvmti->SetSystemProperty((const char *) properties[i], value);
          debug_printf("SetSystemProperty returned error %d\n", res);
  
       }
  
      return JNI_OK;
*** 140,147 ****
  Java_nsk_jvmti_unit_functions_environment_JvmtiTest_GetResult(JNIEnv * env, jclass cls) {
      return iGlobalStatus;
  }
  
  
- #ifdef __cplusplus
  }
- #endif
--- 120,125 ----