test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t010/em02t010.cpp

rev 52050 : [mq]: refactor

*** 146,161 ****
  }
  
  static void
  changeCount(jvmtiEvent event, int *currentCounts) {
  
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, syncLock)))
          nsk_jvmti_setFailStatus();
  
      currentCounts[event - JVMTI_MIN_EVENT_TYPE_VAL]++;
  
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, syncLock)))
          nsk_jvmti_setFailStatus();
  
  }
  
  /* ============================================================================= */
--- 146,161 ----
  }
  
  static void
  changeCount(jvmtiEvent event, int *currentCounts) {
  
!     if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(syncLock)))
          nsk_jvmti_setFailStatus();
  
      currentCounts[event - JVMTI_MIN_EVENT_TYPE_VAL]++;
  
!     if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(syncLock)))
          nsk_jvmti_setFailStatus();
  
  }
  
  /* ============================================================================= */
*** 171,182 ****
      changeCount(JVMTI_EVENT_VM_DEATH, &newEventCount[0]);
      showEventStatistics(STEP_NUMBER);
      if (!checkEvents(STEP_NUMBER))
          nsk_jvmti_setFailStatus();
  
!     if (!NSK_JVMTI_VERIFY(
!             NSK_CPP_STUB2(DestroyRawMonitor, jvmti, syncLock)))
          nsk_jvmti_setFailStatus();
  
  }
  
  void JNICALL
--- 171,181 ----
      changeCount(JVMTI_EVENT_VM_DEATH, &newEventCount[0]);
      showEventStatistics(STEP_NUMBER);
      if (!checkEvents(STEP_NUMBER))
          nsk_jvmti_setFailStatus();
  
!     if (!NSK_JVMTI_VERIFY(jvmti->DestroyRawMonitor(syncLock)))
          nsk_jvmti_setFailStatus();
  
  }
  
  void JNICALL
*** 338,357 ****
  
      if (nsk_jvmti_isOptionalEvent(event)
              && (event != JVMTI_EVENT_FIELD_MODIFICATION)
              && (event != JVMTI_EVENT_FIELD_ACCESS)) {
          if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
!                 NSK_CPP_STUB4(SetEventNotificationMode, jvmti,
!                     JVMTI_ENABLE, event, NULL))) {
              NSK_COMPLAIN1("Unexpected error enabling %s\n",
                  TranslateEvent(event));
              return NSK_FALSE;
          }
      } else {
!         if (!NSK_JVMTI_VERIFY(
!                 NSK_CPP_STUB4(SetEventNotificationMode, jvmti,
!                     JVMTI_ENABLE, event, NULL))) {
              NSK_COMPLAIN1("Unexpected error enabling %s\n",
                  TranslateEvent(event));
              return NSK_FALSE;
          }
      }
--- 337,353 ----
  
      if (nsk_jvmti_isOptionalEvent(event)
              && (event != JVMTI_EVENT_FIELD_MODIFICATION)
              && (event != JVMTI_EVENT_FIELD_ACCESS)) {
          if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
!                 jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
              NSK_COMPLAIN1("Unexpected error enabling %s\n",
                  TranslateEvent(event));
              return NSK_FALSE;
          }
      } else {
!         if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
              NSK_COMPLAIN1("Unexpected error enabling %s\n",
                  TranslateEvent(event));
              return NSK_FALSE;
          }
      }
*** 441,454 ****
  
              eventCallbacks.VMDeath                   = cbVMDeath;
              break;
  
      }
!     if (!NSK_JVMTI_VERIFY(
!             NSK_CPP_STUB3(SetEventCallbacks, jvmti,
!                                 &eventCallbacks,
!                                 sizeof(eventCallbacks))))
          return NSK_FALSE;
  
      return NSK_TRUE;
  }
  
--- 437,447 ----
  
              eventCallbacks.VMDeath                   = cbVMDeath;
              break;
  
      }
!     if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
          return NSK_FALSE;
  
      return NSK_TRUE;
  }
  
*** 464,493 ****
  
  
      if (!nsk_jvmti_waitForSync(timeout))
          return;
  
!     if (!NSK_JNI_VERIFY(agentJNI, (cls =
!             NSK_CPP_STUB2(FindClass, agentJNI, CLASS_NAME)) != NULL))
          return;
  
      if (!NSK_JNI_VERIFY(agentJNI, (field_accID =
!             NSK_CPP_STUB4(GetStaticFieldID, agentJNI, cls, FIELD_ACC_NAME,
!                                 "I")) != NULL))
          return;
  
      if (!NSK_JNI_VERIFY(agentJNI, (field_modID =
!             NSK_CPP_STUB4(GetStaticFieldID, agentJNI, cls, FIELD_MOD_NAME,
!                                 "I")) != NULL))
          return;
  
!     if (!NSK_JVMTI_VERIFY(
!             NSK_CPP_STUB3(SetFieldModificationWatch, jvmti, cls, field_modID)))
          return;
  
!     if (!NSK_JVMTI_VERIFY(
!             NSK_CPP_STUB3(SetFieldAccessWatch, jvmti, cls, field_accID)))
          return;
  
      if (!nsk_jvmti_resumeSync())
          return;
  
--- 457,481 ----
  
  
      if (!nsk_jvmti_waitForSync(timeout))
          return;
  
!     if (!NSK_JNI_VERIFY(agentJNI, (cls = agentJNI->FindClass(CLASS_NAME)) != NULL))
          return;
  
      if (!NSK_JNI_VERIFY(agentJNI, (field_accID =
!             agentJNI->GetStaticFieldID(cls, FIELD_ACC_NAME, "I")) != NULL))
          return;
  
      if (!NSK_JNI_VERIFY(agentJNI, (field_modID =
!             agentJNI->GetStaticFieldID(cls, FIELD_MOD_NAME, "I")) != NULL))
          return;
  
!     if (!NSK_JVMTI_VERIFY(jvmti->SetFieldModificationWatch(cls, field_modID)))
          return;
  
!     if (!NSK_JVMTI_VERIFY(jvmti->SetFieldAccessWatch(cls, field_accID)))
          return;
  
      if (!nsk_jvmti_resumeSync())
          return;
  
*** 534,556 ****
      timeout = nsk_jvmti_getWaitTime() * 60 * 1000;
  
      if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
          return JNI_ERR;
  
!     if (!NSK_JVMTI_VERIFY(
!             NSK_CPP_STUB3(CreateRawMonitor, jvmti, "_syncLock", &syncLock))) {
          nsk_jvmti_setFailStatus();
          return JNI_ERR;
      }
  
      {
          jvmtiCapabilities caps;
          memset(&caps, 0, sizeof(caps));
  
          caps.can_generate_field_modification_events = 1;
          caps.can_generate_field_access_events = 1;
!         if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
              return JNI_ERR;
      }
  
      if (!setCallBacks(1)) {
          return JNI_ERR;
--- 522,543 ----
      timeout = nsk_jvmti_getWaitTime() * 60 * 1000;
  
      if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
          return JNI_ERR;
  
!     if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_syncLock", &syncLock))) {
          nsk_jvmti_setFailStatus();
          return JNI_ERR;
      }
  
      {
          jvmtiCapabilities caps;
          memset(&caps, 0, sizeof(caps));
  
          caps.can_generate_field_modification_events = 1;
          caps.can_generate_field_access_events = 1;
!         if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
              return JNI_ERR;
      }
  
      if (!setCallBacks(1)) {
          return JNI_ERR;