test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor003/setthrdstor003.cpp

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

*** 118,129 ****
  callbackThreadStart(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
      /* check if event is for tested thread */
      if (thread != NULL) {
          jvmtiThreadInfo info;
  
!         if (!NSK_JVMTI_VERIFY(
!                 NSK_CPP_STUB3(GetThreadInfo, jvmti, thread, &info))) {
              nsk_jvmti_setFailStatus();
              return;
          }
  
          if (info.name != NULL && strcmp(info.name, THREAD_NAME) == 0) {
--- 118,128 ----
  callbackThreadStart(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
      /* check if event is for tested thread */
      if (thread != NULL) {
          jvmtiThreadInfo info;
  
!         if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(thread, &info))) {
              nsk_jvmti_setFailStatus();
              return;
          }
  
          if (info.name != NULL && strcmp(info.name, THREAD_NAME) == 0) {
*** 131,143 ****
                                                              (void*)thread, info.name);
              eventsStart++;
  
              NSK_DISPLAY1("SetThreadLocalStorage() for current thread with pointer: %p\n",
                                                                  (void*)initialStorage);
!             if (!NSK_JVMTI_VERIFY(
!                     NSK_CPP_STUB3(SetThreadLocalStorage, jvmti,
!                                         NULL, (void*)initialStorage))) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
          }
      }
--- 130,140 ----
                                                              (void*)thread, info.name);
              eventsStart++;
  
              NSK_DISPLAY1("SetThreadLocalStorage() for current thread with pointer: %p\n",
                                                                  (void*)initialStorage);
!             if (!NSK_JVMTI_VERIFY(jvmti->SetThreadLocalStorage(NULL, (void*)initialStorage))) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
          }
      }
*** 149,160 ****
  callbackThreadEnd(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
      /* check if event is for tested thread */
      if (thread != NULL) {
          jvmtiThreadInfo info;
  
!         if (!NSK_JVMTI_VERIFY(
!                 NSK_CPP_STUB3(GetThreadInfo, jvmti, thread, &info))) {
              nsk_jvmti_setFailStatus();
              return;
          }
  
          if (info.name != NULL && strcmp(info.name, THREAD_NAME) == 0) {
--- 146,156 ----
  callbackThreadEnd(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
      /* check if event is for tested thread */
      if (thread != NULL) {
          jvmtiThreadInfo info;
  
!         if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(thread, &info))) {
              nsk_jvmti_setFailStatus();
              return;
          }
  
          if (info.name != NULL && strcmp(info.name, THREAD_NAME) == 0) {
*** 166,177 ****
              {
                  StorageStructure* obtainedStorage = NULL;
  
                  NSK_DISPLAY0("GetThreadLocalStorage() for current thread\n");
                  if (!NSK_JVMTI_VERIFY(
!                         NSK_CPP_STUB3(GetThreadLocalStorage, jvmti,
!                                             NULL, (void**)&obtainedStorage))) {
                      nsk_jvmti_setFailStatus();
                      return;
                  }
                  NSK_DISPLAY1("  ... got pointer: %p\n", (void*)obtainedStorage);
  
--- 162,172 ----
              {
                  StorageStructure* obtainedStorage = NULL;
  
                  NSK_DISPLAY0("GetThreadLocalStorage() for current thread\n");
                  if (!NSK_JVMTI_VERIFY(
!                         jvmti->GetThreadLocalStorage(NULL, (void**)&obtainedStorage))) {
                      nsk_jvmti_setFailStatus();
                      return;
                  }
                  NSK_DISPLAY1("  ... got pointer: %p\n", (void*)obtainedStorage);
  
*** 241,252 ****
      {
          jvmtiEventCallbacks callbacks;
          memset(&callbacks, 0, sizeof(callbacks));
          callbacks.ThreadStart = callbackThreadStart;
          callbacks.ThreadEnd = callbackThreadEnd;
!         if (!NSK_JVMTI_VERIFY(
!                 NSK_CPP_STUB3(SetEventCallbacks, jvmti, &callbacks, sizeof(callbacks))))
          return JNI_ERR;
      }
  
      /* register agent proc and arg */
      if (!NSK_VERIFY(nsk_jvmti_setAgentProc(agentProc, NULL)))
--- 236,246 ----
      {
          jvmtiEventCallbacks callbacks;
          memset(&callbacks, 0, sizeof(callbacks));
          callbacks.ThreadStart = callbackThreadStart;
          callbacks.ThreadEnd = callbackThreadEnd;
!         if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
          return JNI_ERR;
      }
  
      /* register agent proc and arg */
      if (!NSK_VERIFY(nsk_jvmti_setAgentProc(agentProc, NULL)))