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

rev 52050 : [mq]: refactor

*** 50,61 ****
  JNIEXPORT void JNICALL
  Java_nsk_jvmti_scenarios_events_EM02_em02t012_setThread(JNIEnv *jni_env,
                          jobject o, jthread thrd) {
  
      /* make thread accessable for a long time */
!     NSK_JNI_VERIFY(jni_env, (testedThread =
!             NSK_CPP_STUB2(NewGlobalRef, jni_env, thrd)) != NULL);
  }
  
  static void
  showEventStatistics(int step) {
      int i;
--- 50,60 ----
  JNIEXPORT void JNICALL
  Java_nsk_jvmti_scenarios_events_EM02_em02t012_setThread(JNIEnv *jni_env,
                          jobject o, jthread thrd) {
  
      /* make thread accessable for a long time */
!     NSK_JNI_VERIFY(jni_env, (testedThread = jni_env->NewGlobalRef(thrd)) != NULL);
  }
  
  static void
  showEventStatistics(int step) {
      int i;
*** 149,164 ****
  }
  
  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();
  
  }
  
  /* ============================================================================= */
--- 148,163 ----
  }
  
  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();
  
  }
  
  /* ============================================================================= */
*** 174,185 ****
      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
--- 173,183 ----
      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
*** 329,348 ****
  static int enableEvent(jvmtiEvent event) {
  
      if (nsk_jvmti_isOptionalEvent(event)
              && (event != JVMTI_EVENT_FRAME_POP)) {
          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;
          }
      }
--- 327,343 ----
  static int enableEvent(jvmtiEvent event) {
  
      if (nsk_jvmti_isOptionalEvent(event)
              && (event != JVMTI_EVENT_FRAME_POP)) {
          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;
          }
      }
*** 431,444 ****
  
              eventCallbacks.VMDeath                   = cbVMDeath;
              break;
  
      }
!     if (!NSK_JVMTI_VERIFY(
!             NSK_CPP_STUB3(SetEventCallbacks, jvmti,
!                                 &eventCallbacks,
!                                 sizeof(eventCallbacks))))
          return NSK_FALSE;
  
      return NSK_TRUE;
  }
  
--- 426,436 ----
  
              eventCallbacks.VMDeath                   = cbVMDeath;
              break;
  
      }
!     if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
          return NSK_FALSE;
  
      return NSK_TRUE;
  }
  
*** 453,474 ****
      for (i = 1; i <= STEP_NUMBER; i++) {
  
          if (!nsk_jvmti_waitForSync(timeout))
              return;
  
!         if (!NSK_JVMTI_VERIFY(
!                 NSK_CPP_STUB2(SuspendThread, jvmti, testedThread)))
              return;
  
          for (j = 2; j < 1002; j++) {
!             if (!NSK_JVMTI_VERIFY(
!                     NSK_CPP_STUB3(NotifyFramePop, jvmti, testedThread, j)))
                  return;
          }
  
!         if (!NSK_JVMTI_VERIFY(
!                 NSK_CPP_STUB2(ResumeThread, jvmti, testedThread)))
              return;
  
          if (!nsk_jvmti_resumeSync())
              return;
  
--- 445,463 ----
      for (i = 1; i <= STEP_NUMBER; i++) {
  
          if (!nsk_jvmti_waitForSync(timeout))
              return;
  
!         if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(testedThread)))
              return;
  
          for (j = 2; j < 1002; j++) {
!             if (!NSK_JVMTI_VERIFY(jvmti->NotifyFramePop(testedThread, j)))
                  return;
          }
  
!         if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(testedThread)))
              return;
  
          if (!nsk_jvmti_resumeSync())
              return;
  
*** 487,497 ****
  
          if (!nsk_jvmti_resumeSync())
              return;
      }
  
!     NSK_CPP_STUB2(DeleteGlobalRef, agentJNI, testedThread);
  }
  
  /* ============================================================================= */
  
  /** Agent library initialization. */
--- 476,486 ----
  
          if (!nsk_jvmti_resumeSync())
              return;
      }
  
!     agentJNI->DeleteGlobalRef(testedThread);
  }
  
  /* ============================================================================= */
  
  /** Agent library initialization. */
*** 514,536 ****
      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_suspend = 1;
          caps.can_generate_frame_pop_events = 1;
!         if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
              return JNI_ERR;
      }
  
      if (!setCallBacks(1)) {
          return JNI_ERR;
--- 503,524 ----
      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_suspend = 1;
          caps.can_generate_frame_pop_events = 1;
!         if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
              return JNI_ERR;
      }
  
      if (!setCallBacks(1)) {
          return JNI_ERR;