test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp

rev 52028 : 8211801: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/scenarios/[A-E]
Summary:
Reviewed-by:

*** 61,77 ****
  
          if (class_being_redefined == NULL) {
              /* sent by class load */
  
              if (!NSK_JNI_VERIFY(jni_env, (*new_class_data_len =
!                     NSK_CPP_STUB2(GetArrayLength, jni_env, classBytes)) > 0)) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
  
              if (!NSK_JNI_VERIFY(jni_env, (*new_class_data = (unsigned char*)
!                     NSK_CPP_STUB3(GetByteArrayElements, jni_env, classBytes, NULL))
                          != NULL)) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
          }
--- 61,77 ----
  
          if (class_being_redefined == NULL) {
              /* sent by class load */
  
              if (!NSK_JNI_VERIFY(jni_env, (*new_class_data_len =
!                     jni_env->GetArrayLength(classBytes)) > 0)) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
  
              if (!NSK_JNI_VERIFY(jni_env, (*new_class_data = (unsigned char*)
!                     jni_env->GetByteArrayElements(classBytes, NULL))
                          != NULL)) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
          }
*** 84,117 ****
      const char* DEBUGEE_CLASS_NAME =
          "nsk/jvmti/scenarios/bcinstr/BI03/bi03t001";
      jfieldID field = NULL;
  
      NSK_DISPLAY1("Find class: %s\n", DEBUGEE_CLASS_NAME);
!     if (!NSK_JNI_VERIFY(jni, (debugeeClass =
!             NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL))
          return NSK_FALSE;
  
!     if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass)
!             NSK_CPP_STUB2(NewGlobalRef, jni, debugeeClass)) != NULL))
          return NSK_FALSE;
  
      if (!NSK_JNI_VERIFY(jni, (field =
!             NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass,
!                 "newClassBytes", "[B")) != NULL))
          return NSK_FALSE;
  
      if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)
!             NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, field))
                  != NULL))
          return NSK_FALSE;
  
!     if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)
!             NSK_CPP_STUB2(NewGlobalRef, jni, classBytes)) != NULL))
          return NSK_FALSE;
  
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
!             jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
          return JNI_ERR;
  
      return NSK_TRUE;
  }
  
--- 84,114 ----
      const char* DEBUGEE_CLASS_NAME =
          "nsk/jvmti/scenarios/bcinstr/BI03/bi03t001";
      jfieldID field = NULL;
  
      NSK_DISPLAY1("Find class: %s\n", DEBUGEE_CLASS_NAME);
!     if (!NSK_JNI_VERIFY(jni, (debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL))
          return NSK_FALSE;
  
!     if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass)jni->NewGlobalRef(debugeeClass)) != NULL))
          return NSK_FALSE;
  
      if (!NSK_JNI_VERIFY(jni, (field =
!             jni->GetStaticFieldID(debugeeClass, "newClassBytes", "[B")) != NULL))
          return NSK_FALSE;
  
      if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)
!             jni->GetStaticObjectField(debugeeClass, field))
                  != NULL))
          return NSK_FALSE;
  
!     if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)jni->NewGlobalRef(classBytes)) != NULL))
          return NSK_FALSE;
  
!     if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE,
!                                                           JVMTI_EVENT_CLASS_FILE_LOAD_HOOK,
!                                                           NULL)))
          return JNI_ERR;
  
      return NSK_TRUE;
  }
  
*** 138,153 ****
      if (!NSK_VERIFY(ClassFileLoadHookEventFlag)) {
          NSK_COMPLAIN0("Missing ClassFileLoadHook event\n");
          nsk_jvmti_setFailStatus();
      }
  
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
!             jvmti, JVMTI_DISABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
          nsk_jvmti_setFailStatus();
  
!     NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, debugeeClass));
!     NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, classBytes));
  
      if (!nsk_jvmti_resumeSync())
          return;
  }
  
--- 135,151 ----
      if (!NSK_VERIFY(ClassFileLoadHookEventFlag)) {
          NSK_COMPLAIN0("Missing ClassFileLoadHook event\n");
          nsk_jvmti_setFailStatus();
      }
  
!     if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_DISABLE,
!                                                           JVMTI_EVENT_CLASS_FILE_LOAD_HOOK,
!                                                           NULL)))
          nsk_jvmti_setFailStatus();
  
!     NSK_TRACE(jni->DeleteGlobalRef(debugeeClass));
!     NSK_TRACE(jni->DeleteGlobalRef(classBytes));
  
      if (!nsk_jvmti_resumeSync())
          return;
  }
  
*** 181,200 ****
              nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
          return JNI_ERR;
  
      memset(&caps, 0, sizeof(caps));
      caps.can_generate_all_class_hook_events = 1;
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
          return JNI_ERR;
  
      if (!NSK_VERIFY(nsk_jvmti_setAgentProc(agentProc, NULL)))
          return JNI_ERR;
  
      memset(&callbacks, 0, sizeof(callbacks));
      callbacks.ClassFileLoadHook = &ClassFileLoadHook;
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks,
!             jvmti, &callbacks, sizeof(callbacks))))
          return JNI_ERR;
  
      return JNI_OK;
  }
  
--- 179,197 ----
              nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
          return JNI_ERR;
  
      memset(&caps, 0, sizeof(caps));
      caps.can_generate_all_class_hook_events = 1;
!     if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
          return JNI_ERR;
  
      if (!NSK_VERIFY(nsk_jvmti_setAgentProc(agentProc, NULL)))
          return JNI_ERR;
  
      memset(&callbacks, 0, sizeof(callbacks));
      callbacks.ClassFileLoadHook = &ClassFileLoadHook;
!     if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
          return JNI_ERR;
  
      return JNI_OK;
  }