test/hotspot/jtreg/vmTestbase/vm/mlvm/share/mlvmJvmtiUtils.cpp

rev 51840 : [mq]: refactor

*** 34,80 ****
  
  void copyFromJString(JNIEnv * pEnv, jstring src, char ** dst) {
      const char * pStr;
          jsize len;
  
!     if ( ! NSK_VERIFY((pStr = NSK_CPP_STUB3(GetStringUTFChars, pEnv, src, NULL)) != NULL) ) {
          return;
      }
  
!     len = NSK_CPP_STUB2(GetStringUTFLength, pEnv, src) + 1;
      *dst = (char*) malloc(len);
      strncpy(*dst, pStr, len);
  
!     NSK_CPP_STUB3(ReleaseStringUTFChars, pEnv, src, pStr);
  }
  
  struct MethodName * getMethodName(jvmtiEnv * pJvmtiEnv, jmethodID method) {
      char * szName;
      char * szSignature;
      jclass clazz;
      struct MethodName * mn;
  
!     if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, pJvmtiEnv, method, &szName, NULL, NULL)) ) {
          return NULL;
      }
  
!     if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetMethodDeclaringClass, pJvmtiEnv, method, &clazz)) ) {
!         NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, pJvmtiEnv, (unsigned char*) szName));
          return NULL;
      }
  
!     if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, pJvmtiEnv, clazz, &szSignature, NULL)) ) {
!         NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, pJvmtiEnv, (unsigned char*) szName));
          return NULL;
      }
  
      mn = (MethodName*) malloc(sizeof(MethodNameStruct));
      strncpy(mn->methodName, szName, sizeof(mn->methodName));
      strncpy(mn->classSig, szSignature, sizeof(mn->classSig));
  
!     NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, pJvmtiEnv, (unsigned char*) szName));
!     NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, pJvmtiEnv, (unsigned char*) szSignature));
      return mn;
  }
  
  char * locationToString(jvmtiEnv * pJvmtiEnv, jmethodID method, jlocation location) {
      struct MethodName * pMN;
--- 34,80 ----
  
  void copyFromJString(JNIEnv * pEnv, jstring src, char ** dst) {
      const char * pStr;
          jsize len;
  
!     if ( ! NSK_VERIFY((pStr = pEnv->GetStringUTFChars(src, NULL)) != NULL) ) {
          return;
      }
  
!     len = pEnv->GetStringUTFLength(src) + 1;
      *dst = (char*) malloc(len);
      strncpy(*dst, pStr, len);
  
!     pEnv->ReleaseStringUTFChars(src, pStr);
  }
  
  struct MethodName * getMethodName(jvmtiEnv * pJvmtiEnv, jmethodID method) {
      char * szName;
      char * szSignature;
      jclass clazz;
      struct MethodName * mn;
  
!     if ( ! NSK_JVMTI_VERIFY(pJvmtiEnv->GetMethodName(method, &szName, NULL, NULL)) ) {
          return NULL;
      }
  
!     if ( ! NSK_JVMTI_VERIFY(pJvmtiEnv->GetMethodDeclaringClass(method, &clazz)) ) {
!         NSK_JVMTI_VERIFY(pJvmtiEnv->Deallocate((unsigned char*) szName));
          return NULL;
      }
  
!     if ( ! NSK_JVMTI_VERIFY(pJvmtiEnv->GetClassSignature(clazz, &szSignature, NULL)) ) {
!         NSK_JVMTI_VERIFY(pJvmtiEnv->Deallocate((unsigned char*) szName));
          return NULL;
      }
  
      mn = (MethodName*) malloc(sizeof(MethodNameStruct));
      strncpy(mn->methodName, szName, sizeof(mn->methodName));
      strncpy(mn->classSig, szSignature, sizeof(mn->classSig));
  
!     NSK_JVMTI_VERIFY(pJvmtiEnv->Deallocate((unsigned char*) szName));
!     NSK_JVMTI_VERIFY(pJvmtiEnv->Deallocate((unsigned char*) szSignature));
      return mn;
  }
  
  char * locationToString(jvmtiEnv * pJvmtiEnv, jmethodID method, jlocation location) {
      struct MethodName * pMN;
*** 105,124 ****
      return result;
  }
  
  void * getTLS(jvmtiEnv * pJvmtiEnv, jthread thread, jsize sizeToAllocate) {
      void * tls;
!     if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadLocalStorage, pJvmtiEnv, thread, &tls)) )
          return NULL;
  
      if ( ! tls) {
          if ( ! NSK_VERIFY((tls = malloc(sizeToAllocate)) != NULL) )
              return NULL;
  
          memset(tls, 0, sizeToAllocate);
  
!         if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetThreadLocalStorage, pJvmtiEnv, thread, tls)) )
              return NULL;
      }
  
      return tls;
  }
--- 105,124 ----
      return result;
  }
  
  void * getTLS(jvmtiEnv * pJvmtiEnv, jthread thread, jsize sizeToAllocate) {
      void * tls;
!     if ( ! NSK_JVMTI_VERIFY(pJvmtiEnv->GetThreadLocalStorage(thread, &tls)) )
          return NULL;
  
      if ( ! tls) {
          if ( ! NSK_VERIFY((tls = malloc(sizeToAllocate)) != NULL) )
              return NULL;
  
          memset(tls, 0, sizeToAllocate);
  
!         if ( ! NSK_JVMTI_VERIFY(pJvmtiEnv->SetThreadLocalStorage(thread, tls)) )
              return NULL;
      }
  
      return tls;
  }