test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp

rev 51942 : [mq]: refactor

*** 60,79 ****
      if (!nsk_jvmti_aod_getThreadName(jvmti, thread, threadName)) {
          nsk_jvmti_aod_disableEventsAndFinish(agentName, testEvents, testEventsNumber, 0, jvmti, jni);
          return;
      }
  
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetAllThreads, jvmti, &threadsCount, &threads))) {
          NSK_COMPLAIN1("%s: failed to get all threads\n", agentName);
          nsk_jvmti_aod_disableEventsAndFinish(agentName, testEvents, testEventsNumber, 0, jvmti, jni);
          return;
      }
  
      nsk_jvmti_aod_deallocate(jvmti, (unsigned char*)threads);
  
!     if (NSK_JVMTI_VERIFY(NSK_CPP_STUB2(
!             RawMonitorEnter, jvmti, eventsCounterMonitor))) {
  
          eventsCounter++;
  
          if (threadStartEvent)
              NSK_DISPLAY3("%s: ThreadStart event received for thread '%s' (eventsCounter: %d)\n", agentName, threadName, eventsCounter);
--- 60,78 ----
      if (!nsk_jvmti_aod_getThreadName(jvmti, thread, threadName)) {
          nsk_jvmti_aod_disableEventsAndFinish(agentName, testEvents, testEventsNumber, 0, jvmti, jni);
          return;
      }
  
!     if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threadsCount, &threads))) {
          NSK_COMPLAIN1("%s: failed to get all threads\n", agentName);
          nsk_jvmti_aod_disableEventsAndFinish(agentName, testEvents, testEventsNumber, 0, jvmti, jni);
          return;
      }
  
      nsk_jvmti_aod_deallocate(jvmti, (unsigned char*)threads);
  
!     if (NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(eventsCounterMonitor))) {
  
          eventsCounter++;
  
          if (threadStartEvent)
              NSK_DISPLAY3("%s: ThreadStart event received for thread '%s' (eventsCounter: %d)\n", agentName, threadName, eventsCounter);
*** 84,94 ****
              NSK_DISPLAY2("%s: all expected events were received (eventsCounter: %d)\n", agentName, eventsCounter);
  
              nsk_jvmti_aod_disableEventsAndFinish(agentName, testEvents, testEventsNumber, success, jvmti, jni);
          }
  
!         if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, eventsCounterMonitor))) {
              success = 0;
          }
      } else {
          success = 0;
      }
--- 83,93 ----
              NSK_DISPLAY2("%s: all expected events were received (eventsCounter: %d)\n", agentName, eventsCounter);
  
              nsk_jvmti_aod_disableEventsAndFinish(agentName, testEvents, testEventsNumber, success, jvmti, jni);
          }
  
!         if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(eventsCounterMonitor))) {
              success = 0;
          }
      } else {
          success = 0;
      }
*** 138,155 ****
          return JNI_ERR;
  
      if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL))
          return JNI_ERR;
  
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, jvmti, "attach045-agent02-eventsCounterMonitor", &eventsCounterMonitor))) {
          return JNI_ERR;
      }
  
      memset(&eventCallbacks,0, sizeof(eventCallbacks));
      eventCallbacks.ThreadStart = threadStartHandler;
      eventCallbacks.ThreadEnd = threadEndHandler;
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) {
          return JNI_ERR;
      }
  
      if (!(nsk_jvmti_aod_enableEvents(jvmti, testEvents, testEventsNumber))) {
          return JNI_ERR;
--- 137,154 ----
          return JNI_ERR;
  
      if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL))
          return JNI_ERR;
  
!     if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("attach045-agent02-eventsCounterMonitor", &eventsCounterMonitor))) {
          return JNI_ERR;
      }
  
      memset(&eventCallbacks,0, sizeof(eventCallbacks));
      eventCallbacks.ThreadStart = threadStartHandler;
      eventCallbacks.ThreadEnd = threadEndHandler;
!     if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) {
          return JNI_ERR;
      }
  
      if (!(nsk_jvmti_aod_enableEvents(jvmti, testEvents, testEventsNumber))) {
          return JNI_ERR;