test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001a.cpp

rev 52050 : [mq]: refactor

*** 63,74 ****
          ClassFileLoadHookEventFlag = NSK_TRUE;
          NSK_DISPLAY0("ClassFileLoadHook event\n");
  
          if (class_being_redefined == NULL) {
              /* sent by class load */
!             if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(Allocate,
!                     jvmti_env, class_data_len, &klass_bytes)))
                  nsk_jvmti_setFailStatus();
              else {
                  memcpy(klass_bytes, class_data, class_data_len);
                  klass_byte_count = class_data_len;
                  for (i = 0; i < klass_byte_count - 3; i++) {
--- 63,73 ----
          ClassFileLoadHookEventFlag = NSK_TRUE;
          NSK_DISPLAY0("ClassFileLoadHook event\n");
  
          if (class_being_redefined == NULL) {
              /* sent by class load */
!             if (!NSK_JVMTI_VERIFY(jvmti_env->Allocate(class_data_len, &klass_bytes)))
                  nsk_jvmti_setFailStatus();
              else {
                  memcpy(klass_bytes, class_data, class_data_len);
                  klass_byte_count = class_data_len;
                  for (i = 0; i < klass_byte_count - 3; i++) {
*** 92,107 ****
  /* ========================================================================== */
  
  static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
  
      NSK_DISPLAY1("Find class: %s\n", CLASS_NAME);
!     if (!NSK_JNI_VERIFY(jni, (testedClass =
!             NSK_CPP_STUB2(FindClass, jni, CLASS_NAME)) != NULL))
          return NSK_FALSE;
  
!     if (!NSK_JNI_VERIFY(jni, (testedClass = (jclass)
!             NSK_CPP_STUB2(NewGlobalRef, jni, testedClass)) != NULL))
          return NSK_FALSE;
  
      return NSK_TRUE;
  }
  
--- 91,104 ----
  /* ========================================================================== */
  
  static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
  
      NSK_DISPLAY1("Find class: %s\n", CLASS_NAME);
!     if (!NSK_JNI_VERIFY(jni, (testedClass = jni->FindClass(CLASS_NAME)) != NULL))
          return NSK_FALSE;
  
!     if (!NSK_JNI_VERIFY(jni, (testedClass = (jclass) jni->NewGlobalRef(testedClass)) != NULL))
          return NSK_FALSE;
  
      return NSK_TRUE;
  }
  
*** 124,134 ****
      klass_bytes[magicIndex+3] = (jbyte)value;
  
      class_def.klass = testedClass;
      class_def.class_byte_count = klass_byte_count;
      class_def.class_bytes = klass_bytes;
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
          return NSK_FALSE;
  
      return NSK_TRUE;
  }
  
--- 121,131 ----
      klass_bytes[magicIndex+3] = (jbyte)value;
  
      class_def.klass = testedClass;
      class_def.class_byte_count = klass_byte_count;
      class_def.class_bytes = klass_bytes;
!     if (!NSK_JVMTI_VERIFY(jvmti->RedefineClasses(1, &class_def)))
          return NSK_FALSE;
  
      return NSK_TRUE;
  }
  
*** 179,193 ****
      if (!NSK_VERIFY(ClassFileLoadHookEventFlag)) {
          NSK_COMPLAIN0("Missing ClassFileLoadHook event #3\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, testedClass));
  
      if (!nsk_jvmti_resumeSync())
          return;
  }
  
--- 176,189 ----
      if (!NSK_VERIFY(ClassFileLoadHookEventFlag)) {
          NSK_COMPLAIN0("Missing ClassFileLoadHook event #3\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(testedClass));
  
      if (!nsk_jvmti_resumeSync())
          return;
  }
  
*** 221,243 ****
              nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
          return JNI_ERR;
  
      memset(&caps, 0, sizeof(caps));
      caps.can_redefine_classes = 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_VERIFY(nsk_jvmti_init_MA(&callbacks)))
          return JNI_ERR;
  
!     if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
!             jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
          return JNI_ERR;
  
      return JNI_OK;
  }
  
--- 217,238 ----
              nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
          return JNI_ERR;
  
      memset(&caps, 0, sizeof(caps));
      caps.can_redefine_classes = 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_VERIFY(nsk_jvmti_init_MA(&callbacks)))
          return JNI_ERR;
  
!     if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
          return JNI_ERR;
  
      return JNI_OK;
  }