/* Various JNI helper functions */
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2019. 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 <cstdlib> /* abort */
-extern "C" {
-
jclass jxbt_get_class(JNIEnv * env, const char *name)
{
jclass cls = env->FindClass(name);
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);
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)
+void jxbt_throw_storage_not_found(JNIEnv* env, const 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);
}
-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);
}
-}