test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.cpp

rev 52185 : [mq]: refactor

*** 113,139 ****
  JNIEXPORT jboolean JNICALL Java_nsk_jvmti_unit_FollowReferences_FollowRefObjects_setTag(JNIEnv* jni, jclass klass, jobject o, jlong tag, jstring sInfo)
  {
      jvmtiEnv * jvmti = nsk_jvmti_getAgentJVMTIEnv();
      jint hashCode;
  
!     if ( ! NSK_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, o, tag) == JVMTI_ERROR_NONE) ) {
          NSK_COMPLAIN2("Can't set tag %li for object %lx\n", tag, o);
          return JNI_FALSE;
      }
  
!     if ( ! NSK_VERIFY(NSK_CPP_STUB3(GetObjectHashCode, jvmti, o, &hashCode) == JVMTI_ERROR_NONE) ) {
          NSK_COMPLAIN1("Can't get hash object %lx\n", o);
          return JNI_FALSE;
      }
  
      NSK_DISPLAY2("setTag: %08x <- % 3li", hashCode, tag);
  
      if ( tag > 0 && tag < MAX_TAG ) {
          jboolean fCopy;
          const char * s;
  
!         if ( ! NSK_VERIFY((s = NSK_CPP_STUB3(GetStringUTFChars, jni, sInfo, &fCopy)) != NULL) ) {
              NSK_COMPLAIN1("Can't get string at %#p\n", sInfo);
              return JNI_FALSE;
          }
  
          if ( ! s ) {
--- 113,139 ----
  JNIEXPORT jboolean JNICALL Java_nsk_jvmti_unit_FollowReferences_FollowRefObjects_setTag(JNIEnv* jni, jclass klass, jobject o, jlong tag, jstring sInfo)
  {
      jvmtiEnv * jvmti = nsk_jvmti_getAgentJVMTIEnv();
      jint hashCode;
  
!     if ( ! NSK_VERIFY(jvmti->SetTag(o, tag) == JVMTI_ERROR_NONE) ) {
          NSK_COMPLAIN2("Can't set tag %li for object %lx\n", tag, o);
          return JNI_FALSE;
      }
  
!     if ( ! NSK_VERIFY(jvmti->GetObjectHashCode(o, &hashCode) == JVMTI_ERROR_NONE) ) {
          NSK_COMPLAIN1("Can't get hash object %lx\n", o);
          return JNI_FALSE;
      }
  
      NSK_DISPLAY2("setTag: %08x <- % 3li", hashCode, tag);
  
      if ( tag > 0 && tag < MAX_TAG ) {
          jboolean fCopy;
          const char * s;
  
!         if ( ! NSK_VERIFY((s = jni->GetStringUTFChars(sInfo, &fCopy)) != NULL) ) {
              NSK_COMPLAIN1("Can't get string at %#p\n", sInfo);
              return JNI_FALSE;
          }
  
          if ( ! s ) {
*** 141,151 ****
              return JNI_FALSE;
          }
  
          g_szTagInfo[tag] = strdup(s);
  
!         NSK_CPP_STUB3(ReleaseStringUTFChars, jni, sInfo, s);
  
          NSK_DISPLAY1(" // %s", g_szTagInfo[tag]);
  
      }
  
--- 141,151 ----
              return JNI_FALSE;
          }
  
          g_szTagInfo[tag] = strdup(s);
  
!         jni->ReleaseStringUTFChars(sInfo, s);
  
          NSK_DISPLAY1(" // %s", g_szTagInfo[tag]);
  
      }
  
*** 158,168 ****
  {
      jvmtiEnv * jvmti = nsk_jvmti_getAgentJVMTIEnv();
  
      jlong tag;
      jvmtiError r;
!     if ( ! NSK_VERIFY((r = NSK_CPP_STUB3(GetTag, jvmti, o, &tag)) == JVMTI_ERROR_NONE) ) {
          NSK_COMPLAIN2("Can't GetTag for object %lx. Return code: %i\n", o, r);
          return -1;
      }
  
      return tag;
--- 158,168 ----
  {
      jvmtiEnv * jvmti = nsk_jvmti_getAgentJVMTIEnv();
  
      jlong tag;
      jvmtiError r;
!     if ( ! NSK_VERIFY((r = jvmti->GetTag(o, &tag)) == JVMTI_ERROR_NONE) ) {
          NSK_COMPLAIN2("Can't GetTag for object %lx. Return code: %i\n", o, r);
          return -1;
      }
  
      return tag;
*** 222,239 ****
      jvmtiEnv * jvmti = nsk_jvmti_getAgentJVMTIEnv();
      jvmtiError r;
      jlong tagFrom, tagTo;
      RefToVerify * pRefRec;
  
!     if ( ! NSK_VERIFY((r = NSK_CPP_STUB3(GetTag, jvmti, from, &tagFrom)) == JVMTI_ERROR_NONE) ) {
          NSK_COMPLAIN2("TEST_BUG: Can't GetTag for object %lx. Return code: %i\n", from, r);
          nsk_jvmti_setFailStatus();
          return JNI_FALSE;
      }
  
  
!     if ( ! NSK_VERIFY((r = NSK_CPP_STUB3(GetTag, jvmti, to, &tagTo)) == JVMTI_ERROR_NONE) ) {
          NSK_COMPLAIN2("TEST_BUG: Can't GetTag for object %lx. Return code: %i\n", to, r);
          nsk_jvmti_setFailStatus();
          return JNI_FALSE;
      }
  
--- 222,239 ----
      jvmtiEnv * jvmti = nsk_jvmti_getAgentJVMTIEnv();
      jvmtiError r;
      jlong tagFrom, tagTo;
      RefToVerify * pRefRec;
  
!     if ( ! NSK_VERIFY((r = jvmti->GetTag(from, &tagFrom)) == JVMTI_ERROR_NONE) ) {
          NSK_COMPLAIN2("TEST_BUG: Can't GetTag for object %lx. Return code: %i\n", from, r);
          nsk_jvmti_setFailStatus();
          return JNI_FALSE;
      }
  
  
!     if ( ! NSK_VERIFY((r = jvmti->GetTag(to, &tagTo)) == JVMTI_ERROR_NONE) ) {
          NSK_COMPLAIN2("TEST_BUG: Can't GetTag for object %lx. Return code: %i\n", to, r);
          nsk_jvmti_setFailStatus();
          return JNI_FALSE;
      }