test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp

rev 51942 : [mq]: refactor

*** 190,201 ****
      jvmtiCapabilities caps;
  
      memset(&caps, 0, sizeof(jvmtiCapabilities));
  
      NSK_DISPLAY0("GetCapabilities() for current JVMTI env\n");
!     if (!NSK_JVMTI_VERIFY(
!             NSK_CPP_STUB2(GetCapabilities, jvmti, &caps))) {
          return NSK_FALSE;
      }
  
      NSK_DISPLAY0("Got raw capabilities:\n");
      printRawCapabilities(&caps);
--- 190,200 ----
      jvmtiCapabilities caps;
  
      memset(&caps, 0, sizeof(jvmtiCapabilities));
  
      NSK_DISPLAY0("GetCapabilities() for current JVMTI env\n");
!     if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) {
          return NSK_FALSE;
      }
  
      NSK_DISPLAY0("Got raw capabilities:\n");
      printRawCapabilities(&caps);
*** 214,225 ****
   * Add given capabilities list.
   * @returns NSK_FALSE if any error occured.
   */
  static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char where[]) {
      NSK_DISPLAY0("AddCapabilities() for current JVMTI env\n");
!     if (!NSK_JVMTI_VERIFY(
!             NSK_CPP_STUB2(AddCapabilities, jvmti, caps))) {
          return NSK_FALSE;
      }
      NSK_DISPLAY0("  ... set\n");
  
      return NSK_TRUE;
--- 213,223 ----
   * Add given capabilities list.
   * @returns NSK_FALSE if any error occured.
   */
  static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char where[]) {
      NSK_DISPLAY0("AddCapabilities() for current JVMTI env\n");
!     if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(caps))) {
          return NSK_FALSE;
      }
      NSK_DISPLAY0("  ... set\n");
  
      return NSK_TRUE;
*** 229,240 ****
   * Get potential capabilities to the given list.
   * @returns NSK_FALSE if any error occured.
   */
  static int getPotentialCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) {
      NSK_DISPLAY0("GetPotentialCapabilities() for current JVMTI env\n");
!     if (!NSK_JVMTI_VERIFY(
!             NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, caps))) {
          return NSK_FALSE;
      }
  
      NSK_DISPLAY0("Got raw capabilities:\n");
      printRawCapabilities(caps);
--- 227,237 ----
   * Get potential capabilities to the given list.
   * @returns NSK_FALSE if any error occured.
   */
  static int getPotentialCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) {
      NSK_DISPLAY0("GetPotentialCapabilities() for current JVMTI env\n");
!     if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(caps))) {
          return NSK_FALSE;
      }
  
      NSK_DISPLAY0("Got raw capabilities:\n");
      printRawCapabilities(caps);
*** 332,344 ****
          jvmtiEventCallbacks eventCallbacks;
  
          memset(&eventCallbacks, 0, sizeof(eventCallbacks));
          eventCallbacks.VMInit = callbackVMInit;
          eventCallbacks.VMDeath = callbackVMDeath;
!         if (!NSK_JVMTI_VERIFY(
!                 NSK_CPP_STUB3(SetEventCallbacks, jvmti,
!                                     &eventCallbacks, sizeof(eventCallbacks)))) {
              return JNI_ERR;
          }
  
      }
  
--- 329,339 ----
          jvmtiEventCallbacks eventCallbacks;
  
          memset(&eventCallbacks, 0, sizeof(eventCallbacks));
          eventCallbacks.VMInit = callbackVMInit;
          eventCallbacks.VMDeath = callbackVMDeath;
!         if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
              return JNI_ERR;
          }
  
      }