test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetTag/settag001/settag001.cpp

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

*** 59,106 ****
              jclass debugeeClass = NULL;
              jfieldID objectField = NULL;
  
              NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME);
              if (!NSK_JNI_VERIFY(jni, (debugeeClass =
!                     NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
              NSK_DISPLAY1("  ... found class: 0x%p\n", (void*)debugeeClass);
  
              NSK_DISPLAY1("Find static field: %s\n", OBJECT_FIELD_NAME);
              if (!NSK_JNI_VERIFY(jni, (objectField =
!                     NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass,
!                                     OBJECT_FIELD_NAME, OBJECT_CLASS_SIG)) != NULL)) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
              NSK_DISPLAY1("  ... got fieldID: 0x%p\n", (void*)objectField);
  
              NSK_DISPLAY1("Get object from static field: %s\n", OBJECT_FIELD_NAME);
              if (!NSK_JNI_VERIFY(jni, (testedObject =
!                     NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass,
!                                                             objectField)) != NULL)) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
              NSK_DISPLAY1("  ... got object: 0x%p\n", (void*)testedObject);
  
              NSK_DISPLAY1("Create global reference for object: 0x%p\n", (void*)testedObject);
!             if (!NSK_JNI_VERIFY(jni, (testedObject =
!                     NSK_CPP_STUB2(NewGlobalRef, jni, testedObject)) != NULL)) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
              NSK_DISPLAY1("  ... got reference: 0x%p\n", (void*)testedObject);
          }
  
          NSK_DISPLAY0(">>> Testcase #1: set tag for the tested object\n");
          {
              NSK_DISPLAY1("Set tag for object: 0x%p\n", (void*)testedObject);
!             if (!NSK_JVMTI_VERIFY(
!                     NSK_CPP_STUB3(SetTag, jvmti, testedObject, objectTag))) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
              NSK_DISPLAY1("  ... tag set: %ld\n", (long)objectTag);
          }
--- 59,102 ----
              jclass debugeeClass = NULL;
              jfieldID objectField = NULL;
  
              NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME);
              if (!NSK_JNI_VERIFY(jni, (debugeeClass =
!                     jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
              NSK_DISPLAY1("  ... found class: 0x%p\n", (void*)debugeeClass);
  
              NSK_DISPLAY1("Find static field: %s\n", OBJECT_FIELD_NAME);
              if (!NSK_JNI_VERIFY(jni, (objectField =
!                     jni->GetStaticFieldID(debugeeClass, OBJECT_FIELD_NAME, OBJECT_CLASS_SIG)) != NULL)) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
              NSK_DISPLAY1("  ... got fieldID: 0x%p\n", (void*)objectField);
  
              NSK_DISPLAY1("Get object from static field: %s\n", OBJECT_FIELD_NAME);
              if (!NSK_JNI_VERIFY(jni, (testedObject =
!                     jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
              NSK_DISPLAY1("  ... got object: 0x%p\n", (void*)testedObject);
  
              NSK_DISPLAY1("Create global reference for object: 0x%p\n", (void*)testedObject);
!             if (!NSK_JNI_VERIFY(jni, (testedObject = jni->NewGlobalRef(testedObject)) != NULL)) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
              NSK_DISPLAY1("  ... got reference: 0x%p\n", (void*)testedObject);
          }
  
          NSK_DISPLAY0(">>> Testcase #1: set tag for the tested object\n");
          {
              NSK_DISPLAY1("Set tag for object: 0x%p\n", (void*)testedObject);
!             if (!NSK_JVMTI_VERIFY(jvmti->SetTag(testedObject, objectTag))) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
              NSK_DISPLAY1("  ... tag set: %ld\n", (long)objectTag);
          }
*** 108,119 ****
          NSK_DISPLAY0(">>> Testcase #2: get tag of not changed object and compare with initial\n");
          {
              jlong tag = 222;
  
              NSK_DISPLAY1("Get tag for object: 0x%p\n", (void*)testedObject);
!             if (!NSK_JVMTI_VERIFY(
!                     NSK_CPP_STUB3(GetTag, jvmti, testedObject, &tag))) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
              NSK_DISPLAY1("  ... got tag: %ld\n", (long)tag);
  
--- 104,114 ----
          NSK_DISPLAY0(">>> Testcase #2: get tag of not changed object and compare with initial\n");
          {
              jlong tag = 222;
  
              NSK_DISPLAY1("Get tag for object: 0x%p\n", (void*)testedObject);
!             if (!NSK_JVMTI_VERIFY(jvmti->GetTag(testedObject, &tag))) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
              NSK_DISPLAY1("  ... got tag: %ld\n", (long)tag);
  
*** 138,149 ****
                  return;
              if (!NSK_VERIFY(nsk_jvmti_waitForSync(timeout)))
                  return;
  
              NSK_DISPLAY1("Get tag for object: 0x%p\n", (void*)testedObject);
!             if (!NSK_JVMTI_VERIFY(
!                     NSK_CPP_STUB3(GetTag, jvmti, testedObject, &tag))) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
              NSK_DISPLAY1("  ... got tag: %ld\n", (long)tag);
  
--- 133,143 ----
                  return;
              if (!NSK_VERIFY(nsk_jvmti_waitForSync(timeout)))
                  return;
  
              NSK_DISPLAY1("Get tag for object: 0x%p\n", (void*)testedObject);
!             if (!NSK_JVMTI_VERIFY(jvmti->GetTag(testedObject, &tag))) {
                  nsk_jvmti_setFailStatus();
                  return;
              }
              NSK_DISPLAY1("  ... got tag: %ld\n", (long)tag);
  
*** 160,170 ****
          }
  
          NSK_DISPLAY0(">>> Clean used data\n");
          {
              NSK_DISPLAY1("Delete object reference: 0x%p\n", (void*)testedObject);
!             NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedObject));
          }
      }
  
      NSK_DISPLAY0("Let debugee to finish\n");
      if (!NSK_VERIFY(nsk_jvmti_resumeSync()))
--- 154,164 ----
          }
  
          NSK_DISPLAY0(">>> Clean used data\n");
          {
              NSK_DISPLAY1("Delete object reference: 0x%p\n", (void*)testedObject);
!             NSK_TRACE(jni->DeleteGlobalRef(testedObject));
          }
      }
  
      NSK_DISPLAY0("Let debugee to finish\n");
      if (!NSK_VERIFY(nsk_jvmti_resumeSync()))
*** 203,214 ****
      {
          jvmtiCapabilities caps;
  
          memset(&caps, 0, sizeof(caps));
          caps.can_tag_objects = 1;
!         if (!NSK_JVMTI_VERIFY(
!                 NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
              return JNI_ERR;
          }
      }
  
      /* register agent proc and arg */
--- 197,207 ----
      {
          jvmtiCapabilities caps;
  
          memset(&caps, 0, sizeof(caps));
          caps.can_tag_objects = 1;
!         if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
              return JNI_ERR;
          }
      }
  
      /* register agent proc and arg */