X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48eb2f1b9262fc74f527816c348ed2aa6efa9f65..67d66b0cf79b9fc02c0450f254584693dbf21d3b:/src/bindings/java/jxbt_utilities.cpp

diff --git a/src/bindings/java/jxbt_utilities.cpp b/src/bindings/java/jxbt_utilities.cpp
index a5e6ed1ab7..771ad2a404 100644
--- a/src/bindings/java/jxbt_utilities.cpp
+++ b/src/bindings/java/jxbt_utilities.cpp
@@ -1,21 +1,17 @@
 /* Various JNI helper functions                                             */
 
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "jxbt_utilities.hpp"
+#include "xbt/string.hpp"
 #include "xbt/sysdep.h"
-#include "jxbt_utilities.h"
-
-#include <cstdlib> /* abort */
-
-SG_BEGIN_DECL()
 
 jclass jxbt_get_class(JNIEnv * env, const char *name)
 {
   jclass cls = env->FindClass(name);
-
   if (not cls) {
     jxbt_throw_jni(env, std::string("Class ") + name + " not found");
     return nullptr;
@@ -26,22 +22,18 @@ jclass jxbt_get_class(JNIEnv * env, const char *name)
 
 jmethodID jxbt_get_jmethod(JNIEnv * env, jclass cls, const char *name, const char *signature)
 {
-  jmethodID id;
-
   if (not cls)
-    return 0;
-  id = env->GetMethodID(cls, name, signature);
+    return nullptr;
 
+  jmethodID id = env->GetMethodID(cls, name, signature);
   if (not id) {
-
     jmethodID tostr_id = env->GetMethodID(cls, "getName", "()Ljava/lang/String;");
-    jstring jclassname = (jstring) env->CallObjectMethod(cls, tostr_id, nullptr);
-    const char *classname = env->GetStringUTFChars(jclassname, 0);
-
-    env->ReleaseStringUTFChars(jclassname, classname);
+    auto jclassname    = (jstring)env->CallObjectMethod(cls, tostr_id, nullptr);
+    jstring_wrapper classname(env, jclassname);
+    auto msg = std::string("Cannot find method") + name + "(" + signature + ") in " + classname.value;
 
-    jxbt_throw_jni(env, std::string("Cannot find method") + name + "(" + signature + ") in " + classname);
-    return 0;
+    jxbt_throw_jni(env, msg);
+    return nullptr;
   }
 
   return id;
@@ -49,21 +41,18 @@ jmethodID jxbt_get_jmethod(JNIEnv * env, jclass cls, const char *name, const cha
 
 jmethodID jxbt_get_static_jmethod(JNIEnv * env, jclass cls, const char *name, const char *signature)
 {
-  jmethodID id;
-
   if (not cls)
-    return 0;
-  id = env->GetStaticMethodID(cls, name, signature);
+    return nullptr;
 
+  jmethodID id = env->GetStaticMethodID(cls, name, signature);
   if (not id) {
     jmethodID tostr_id = env->GetMethodID(cls, "getName", "()Ljava/lang/String;");
-    jstring jclassname = (jstring) env->CallObjectMethod(cls, tostr_id, nullptr);
-    const char *classname = env->GetStringUTFChars(jclassname, 0);
+    auto jclassname       = (jstring)env->CallObjectMethod(cls, tostr_id, nullptr);
+    jstring_wrapper classname(env, jclassname);
+    auto msg = std::string("Cannot find static method") + name + "(" + signature + ") in " + classname.value;
 
-    env->ReleaseStringUTFChars(jclassname, classname);
-
-    jxbt_throw_jni(env, std::string("Cannot find static method") + name + "(" + signature + ") in " + classname);
-    return 0;
+    jxbt_throw_jni(env, msg);
+    return nullptr;
   }
 
   return id;
@@ -71,59 +60,48 @@ jmethodID jxbt_get_static_jmethod(JNIEnv * env, jclass cls, const char *name, co
 
 jmethodID jxbt_get_static_smethod(JNIEnv * env, const char *classname, const char *name, const char *signature)
 {
-  jclass cls;
-  jmethodID id;
-  cls = jxbt_get_class(env, classname);
-
+  jclass cls = jxbt_get_class(env, classname);
   if (not cls)
-    return 0;
-
-  id = env->GetStaticMethodID(cls, name, signature);
+    return nullptr;
 
+  jmethodID id = env->GetStaticMethodID(cls, name, signature);
   if (not id) {
     jxbt_throw_jni(env, std::string("Cannot find static method") + name + "(" + signature + ") in " + classname);
-    return 0;
+    return nullptr;
   }
   return id;
 }
 
 jmethodID jxbt_get_smethod(JNIEnv * env, const char *classname, const char *name, const char *signature)
 {
-  jclass cls;
-  jmethodID id;
-  cls = jxbt_get_class(env, classname);
-
+  jclass cls = jxbt_get_class(env, classname);
   if (not cls)
-    return 0;
-
-  id = env->GetMethodID(cls, name, signature);
+    return nullptr;
 
+  jmethodID id = env->GetMethodID(cls, name, signature);
   if (not id) {
     jxbt_throw_jni(env, std::string("Cannot find method") + name + "(" + signature + ") in " + classname);
-    return 0;
+    return nullptr;
   }
   return id;
 }
 
 jfieldID jxbt_get_jfield(JNIEnv * env, jclass cls, const char *name, const char *signature)
 {
-  jfieldID id;
-
   if (not cls)
-    return 0;
-
-  id = env->GetFieldID(cls, name, signature);
+    return nullptr;
 
+  jfieldID id = env->GetFieldID(cls, name, signature);
   if (not id) {
     jmethodID getname_id = env->GetMethodID(cls, "getName", "()Ljava/lang/String;");
-    jstring jclassname = (jstring) env->CallObjectMethod(cls, getname_id, nullptr);
-    const char *classname = env->GetStringUTFChars(jclassname, 0);
+    auto jclassname       = (jstring)env->CallObjectMethod(cls, getname_id, nullptr);
+    const char* classname = env->GetStringUTFChars(jclassname, nullptr);
 
     env->ReleaseStringUTFChars(jclassname, classname);
 
     jxbt_throw_jni(env, std::string("Cannot find field") + signature + " " + name + " in " + classname);
 
-    return 0;
+    return nullptr;
   }
 
   return id;
@@ -132,22 +110,19 @@ jfieldID jxbt_get_jfield(JNIEnv * env, jclass cls, const char *name, const char
 jfieldID jxbt_get_sfield(JNIEnv * env, const char *classname, const char *name, const char *signature)
 {
   jclass cls = jxbt_get_class(env, classname);
-  jfieldID id;
-
   if (not cls)
-    return 0;
-
-  id = env->GetFieldID(cls, name, signature);
+    return nullptr;
 
+  jfieldID id = env->GetFieldID(cls, name, signature);
   if (not id) {
     jxbt_throw_jni(env, std::string("Cannot find field") + signature + " " + name + " in " + classname);
-    return 0;
+    return nullptr;
   }
 
   return id;
 }
 
-void jxbt_throw_by_name(JNIEnv* env, const char* name, std::string msg)
+void jxbt_throw_by_name(JNIEnv* env, const char* name, const std::string& msg)
 {
   jclass cls = env->FindClass(name);
 
@@ -156,60 +131,53 @@ void jxbt_throw_by_name(JNIEnv* env, const char* name, std::string msg)
   env->ThrowNew(cls, msg.c_str());
 }
 
-void jxbt_throw_jni(JNIEnv* env, std::string msg)
+void jxbt_throw_jni(JNIEnv* env, const std::string& msg)
 {
   jxbt_throw_by_name(env, "org/simgrid/msg/JniException", "Internal or JNI error: " + msg);
 }
 
-void jxbt_throw_notbound(JNIEnv* env, std::string kind, void* pointer)
+void jxbt_throw_notbound(JNIEnv* env, const std::string& kind, void* pointer)
 {
   jxbt_throw_by_name(env, "org/simgrid/msg/JniException",
-                     "Internal error: " + kind + " " + static_cast<const char*>(pointer) + " not bound");
+                     simgrid::xbt::string_printf("Internal error: %s %p not bound", kind.c_str(), pointer));
 }
 
-void jxbt_throw_null(JNIEnv* env, std::string msg)
+void jxbt_throw_null(JNIEnv* env, const std::string& msg)
 {
   jxbt_throw_by_name(env, "java/lang/NullPointerException", msg);
 }
 
-void jxbt_throw_illegal(JNIEnv* env, std::string msg)
+void jxbt_throw_illegal(JNIEnv* env, const std::string& msg)
 {
   jxbt_throw_by_name(env, "java/lang/IllegalArgumentException", msg);
 }
 
-void jxbt_throw_host_not_found(JNIEnv* env, std::string invalid_name)
+void jxbt_throw_host_not_found(JNIEnv* env, const std::string& invalid_name)
 {
   jxbt_throw_by_name(env, "org/simgrid/msg/HostNotFoundException", "No such host: " + invalid_name);
 }
 
-void jxbt_throw_storage_not_found(JNIEnv* env, std::string invalid_name)
-{
-  jxbt_throw_by_name(env, "org/simgrid/msg/StorageNotFoundException", "No such storage: " + invalid_name);
-}
-
-void jxbt_throw_process_not_found(JNIEnv* env, std::string invalid_name)
+void jxbt_throw_process_not_found(JNIEnv* env, const std::string& invalid_name)
 {
   jxbt_throw_by_name(env, "org/simgrid/msg/ProcessNotFoundException", "No such process: " + invalid_name);
 }
 
-void jxbt_throw_transfer_failure(JNIEnv* env, std::string details)
+void jxbt_throw_transfer_failure(JNIEnv* env, const std::string& details)
 {
   jxbt_throw_by_name(env, "org/simgrid/msg/TransferFailureException", details);
 }
 
-void jxbt_throw_host_failure(JNIEnv* env, std::string details)
+void jxbt_throw_host_failure(JNIEnv* env, const std::string& details)
 {
-  jxbt_throw_by_name(env, "org/simgrid/msg/HostFailureException", "Host Failure " + details);
+  jxbt_throw_by_name(env, "org/simgrid/msg/HostFailureException", "Host Failure" + details);
 }
 
-void jxbt_throw_time_out_failure(JNIEnv* env, std::string details)
+void jxbt_throw_time_out_failure(JNIEnv* env, const std::string& details)
 {
   jxbt_throw_by_name(env, "org/simgrid/msg/TimeoutException", details);
 }
 
-void jxbt_throw_task_cancelled(JNIEnv* env, std::string details)
+void jxbt_throw_task_cancelled(JNIEnv* env, const std::string& details)
 {
   jxbt_throw_by_name(env, "org/simgrid/msg/TaskCancelledException", details);
 }
-
-SG_END_DECL()