test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008.cpp

rev 52100 : 8212082: Remove the NSK_CPP_STUB macros for remaining vmTestbase/jvmti/[sS]*
Summary:
Reviewed-by:

*** 53,64 ****
      jvmtiThreadInfo info;
  
      MonitorContendedEnterEventsCount++;
  
      /* get thread information */
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
!             thread, &info))) {
          nsk_jvmti_setFailStatus();
          return;
      }
      NSK_DISPLAY2("MonitorContendedEnter event: thread=\"%s\", object=0x%p\n",
          info.name, object);
--- 53,63 ----
      jvmtiThreadInfo info;
  
      MonitorContendedEnterEventsCount++;
  
      /* get thread information */
!     if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
          nsk_jvmti_setFailStatus();
          return;
      }
      NSK_DISPLAY2("MonitorContendedEnter event: thread=\"%s\", object=0x%p\n",
          info.name, object);
*** 70,81 ****
      jvmtiThreadInfo info;
  
      MonitorContendedEnteredEventsCount++;
  
      /* get thread information */
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
!             thread, &info))) {
          nsk_jvmti_setFailStatus();
          return;
      }
      NSK_DISPLAY2("MonitorContendedEntered event: thread=\"%s\", object=0x%p\n",
          info.name, object);
--- 69,79 ----
      jvmtiThreadInfo info;
  
      MonitorContendedEnteredEventsCount++;
  
      /* get thread information */
!     if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
          nsk_jvmti_setFailStatus();
          return;
      }
      NSK_DISPLAY2("MonitorContendedEntered event: thread=\"%s\", object=0x%p\n",
          info.name, object);
*** 87,98 ****
      jvmtiThreadInfo info;
  
      MonitorWaitEventsCount++;
  
      /* get thread information */
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
!             thread, &info))) {
          nsk_jvmti_setFailStatus();
          return;
      }
      NSK_DISPLAY2("MonitorWait event: thread=\"%s\", object=0x%p\n",
          info.name, object);
--- 85,95 ----
      jvmtiThreadInfo info;
  
      MonitorWaitEventsCount++;
  
      /* get thread information */
!     if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
          nsk_jvmti_setFailStatus();
          return;
      }
      NSK_DISPLAY2("MonitorWait event: thread=\"%s\", object=0x%p\n",
          info.name, object);
*** 104,115 ****
      jvmtiThreadInfo info;
  
      MonitorWaitedEventsCount++;
  
      /* get thread information */
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
!             thread, &info))) {
          nsk_jvmti_setFailStatus();
          return;
      }
      NSK_DISPLAY2("MonitorWaited event: thread=\"%s\", object=0x%p\n",
          info.name, object);
--- 101,111 ----
      jvmtiThreadInfo info;
  
      MonitorWaitedEventsCount++;
  
      /* get thread information */
!     if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
          nsk_jvmti_setFailStatus();
          return;
      }
      NSK_DISPLAY2("MonitorWaited event: thread=\"%s\", object=0x%p\n",
          info.name, object);
*** 187,197 ****
      if (!NSK_VERIFY(nsk_jvmti_setAgentProc(agentProc, NULL)))
          return JNI_ERR;
  
      memset(&caps, 0, sizeof(caps));
      caps.can_generate_monitor_events = 1;
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
          return JNI_ERR;
      }
  
      memset(&callbacks, 0, sizeof(callbacks));
      callbacks.MonitorContendedEnter = &MonitorContendedEnter;
--- 183,193 ----
      if (!NSK_VERIFY(nsk_jvmti_setAgentProc(agentProc, NULL)))
          return JNI_ERR;
  
      memset(&caps, 0, sizeof(caps));
      caps.can_generate_monitor_events = 1;
!     if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
          return JNI_ERR;
      }
  
      memset(&callbacks, 0, sizeof(callbacks));
      callbacks.MonitorContendedEnter = &MonitorContendedEnter;
*** 200,220 ****
      callbacks.MonitorWaited = &MonitorWaited;
      if (!NSK_VERIFY(nsk_jvmti_init_MA(&callbacks)))
          return JNI_ERR;
  
      /* enable events */
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
!             jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
          return JNI_ERR;
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
!             jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
          return JNI_ERR;
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
!             jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAIT, NULL)))
          return JNI_ERR;
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
!             jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAITED, NULL)))
          return JNI_ERR;
  
      return JNI_OK;
  }
  
--- 196,212 ----
      callbacks.MonitorWaited = &MonitorWaited;
      if (!NSK_VERIFY(nsk_jvmti_init_MA(&callbacks)))
          return JNI_ERR;
  
      /* enable events */
!     if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
          return JNI_ERR;
!     if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
          return JNI_ERR;
!     if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAIT, NULL)))
          return JNI_ERR;
!     if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAITED, NULL)))
          return JNI_ERR;
  
      return JNI_OK;
  }