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

diff --git a/src/bindings/java/jxbt_utilities.hpp b/src/bindings/java/jxbt_utilities.hpp
index e653c128fc..c882d5cb1e 100644
--- a/src/bindings/java/jxbt_utilities.hpp
+++ b/src/bindings/java/jxbt_utilities.hpp
@@ -1,6 +1,6 @@
 /* Various JNI helper functions                                             */
 
-/* Copyright (c) 2007-2019. 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. */
@@ -33,45 +33,58 @@ jmethodID jxbt_get_static_smethod(JNIEnv* env, const char* classname, const char
 /* Search a field in a class and throw an exception if not found (it's ok to to pass a NULL class: it's a noop) */
 jfieldID jxbt_get_sfield(JNIEnv* env, const char* classname, const char* name, const char* signature);
 
-#define jxbt_check_res(fun, res, allowed_exceptions, detail)                                                           \
-  do {                                                                                                                 \
-    if (res != MSG_OK && (res | allowed_exceptions)) {                                                                 \
-      xbt_die("%s failed with error code %d, which is not an allowed exception. Please fix me.", fun, res);            \
-    } else if (res == MSG_HOST_FAILURE) {                                                                              \
-      jxbt_throw_host_failure(env, detail);                                                                            \
-    } else if (res == MSG_TRANSFER_FAILURE) {                                                                          \
-      jxbt_throw_transfer_failure(env, detail);                                                                        \
-    } else if (res == MSG_TIMEOUT) {                                                                                   \
-      jxbt_throw_time_out_failure(env, detail);                                                                        \
-    } else if (res == MSG_TASK_CANCELED) {                                                                             \
-      jxbt_throw_task_cancelled(env, detail);                                                                          \
-    }                                                                                                                  \
-  } while (0)
-
 /* Throws an exception according to its name */
-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);
 /** Thrown on internal error of this layer, or on problem with JNI */
-void jxbt_throw_jni(JNIEnv* env, std::string msg);
+void jxbt_throw_jni(JNIEnv* env, const std::string& msg);
 /** Thrown when using an object not bound to a native one where it should, or reverse (kinda JNI issue) */
-void jxbt_throw_notbound(JNIEnv* env, std::string kind, void* pointer);
+void jxbt_throw_notbound(JNIEnv* env, const std::string& kind, void* pointer);
 /** Thrown if NULL gets used */
-void jxbt_throw_null(JNIEnv* env, std::string msg);
+void jxbt_throw_null(JNIEnv* env, const std::string& msg);
 
 /** Thrown on illegal arguments */
-void jxbt_throw_illegal(JNIEnv* env, std::string msg);
+void jxbt_throw_illegal(JNIEnv* env, const std::string& msg);
 /** Thrown when looking for a host from name does not lead to anything */
-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);
 /** Thrown when looking for a host from name does not lead to anything */
-void jxbt_throw_process_not_found(JNIEnv* env, std::string invalid_name);
-/** Thrown when a transfer failure accure while Sending task */
-void jxbt_throw_transfer_failure(JNIEnv* env, std::string detail);
+void jxbt_throw_process_not_found(JNIEnv* env, const std::string& invalid_name);
+/** Thrown when a transfer failure occurs while Sending task */
+void jxbt_throw_transfer_failure(JNIEnv* env, const std::string& detail);
 /** Thrown when a host failure occurs while Sending a task*/
-void jxbt_throw_host_failure(JNIEnv* env, std::string details);
+void jxbt_throw_host_failure(JNIEnv* env, const std::string& details);
 /** Thrown when a timeout occurs while Sending a task */
-void jxbt_throw_time_out_failure(JNIEnv* env, std::string details);
+void jxbt_throw_time_out_failure(JNIEnv* env, const std::string& details);
 /**Thrown when a task is canceled */
-void jxbt_throw_task_cancelled(JNIEnv* env, std::string details);
-/** Thrown when looking for a storage from name does not lead to anything */
-void jxbt_throw_storage_not_found(JNIEnv* env, std::string invalid_name);
+void jxbt_throw_task_cancelled(JNIEnv* env, const std::string& details);
+
+class jstring_wrapper {
+  JNIEnv* env_  = nullptr;
+  jstring jstr_ = nullptr;
+
+public:
+  const char* value = nullptr;
+
+  jstring_wrapper(JNIEnv* env, jstring jstr) : env_(env), jstr_(jstr)
+  {
+    if (jstr != nullptr)
+      value = env_->GetStringUTFChars(jstr_, nullptr);
+  }
+  void reset(JNIEnv* env, jstring jstr)
+  {
+    if (jstr_ != nullptr)
+      env_->ReleaseStringUTFChars(jstr_, value);
+    env_  = env;
+    jstr_ = jstr;
+    if (jstr != nullptr)
+      value = env_->GetStringUTFChars(jstr_, nullptr);
+  }
+  ~jstring_wrapper()
+  {
+    if (jstr_ != nullptr)
+      env_->ReleaseStringUTFChars(jstr_, value);
+  }
+  operator const char*() const { return value; }
+  operator const std::string() const { return std::string(value); }
+};
 
 #endif