X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c4da33390d8e7d8ae8ca19d2e7b923f5c87d686..0ba0b5da8a4948ab678226c4456f97b9b85a71c6:/src/bindings/java/jmsg_storage.cpp diff --git a/src/bindings/java/jmsg_storage.cpp b/src/bindings/java/jmsg_storage.cpp index abd552e88b..7b5003f6c1 100644 --- a/src/bindings/java/jmsg_storage.cpp +++ b/src/bindings/java/jmsg_storage.cpp @@ -1,20 +1,19 @@ -/* Functions related to the java storage API. */ +/* Java bindings of the Storage API. */ -/* Copyright (c) 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2012-2017. 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 -#include - #include "simgrid/msg.h" + #include "jmsg.h" #include "jmsg_storage.h" #include "jxbt_utilities.h" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); + +SG_BEGIN_DECL() static jmethodID jstorage_method_Storage_constructor; static jfieldID jstorage_field_Storage_bind; @@ -31,12 +30,12 @@ msg_storage_t jstorage_get_native(JNIEnv * env, jobject jstorage) { JNIEXPORT void JNICALL Java_org_simgrid_msg_Storage_nativeInit(JNIEnv *env, jclass cls) { jclass class_Storage = env->FindClass("org/simgrid/msg/Storage"); + xbt_assert(class_Storage, "Native initialization of msg/Storage failed. Please report that bug"); jstorage_method_Storage_constructor = env->GetMethodID(class_Storage, "", "()V"); jstorage_field_Storage_bind = jxbt_get_jfield(env,class_Storage, "bind", "J"); jstorage_field_Storage_name = jxbt_get_jfield(env, class_Storage, "name", "Ljava/lang/String;"); - if (!class_Storage || !jstorage_field_Storage_name || !jstorage_method_Storage_constructor || !jstorage_field_Storage_bind) { - jxbt_throw_native(env,bprintf("Can't find some fields in Java class. You should report this bug.")); - } + xbt_assert(jstorage_field_Storage_name && jstorage_method_Storage_constructor && jstorage_field_Storage_bind, + "Native initialization of msg/Storage failed. Please report that bug"); } void jstorage_bind(jobject jstorage, msg_storage_t storage, JNIEnv * env) { @@ -51,36 +50,30 @@ void jstorage_unref(JNIEnv * env, jobject jstorage) { env->DeleteGlobalRef(jstorage); } -const char *jstorage_get_name(jobject jstorage, JNIEnv * env) { - msg_storage_t storage = jstorage_get_native(env, jstorage); - return MSG_storage_get_name(storage); -} - JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getByName(JNIEnv * env, jclass cls, jstring jname) { msg_storage_t storage; - jobject jstorage; + jobject jstorage = nullptr; /* get the C string from the java string */ if (jname == nullptr) { - jxbt_throw_null(env,bprintf("No host can have a null name")); + jxbt_throw_null(env, "No host can have a null name"); return nullptr; } const char *name = env->GetStringUTFChars(jname, 0); storage = MSG_storage_get_by_name(name); - if (!storage) { /* invalid name */ + if (not storage) { /* invalid name */ jxbt_throw_storage_not_found(env, name); env->ReleaseStringUTFChars(jname, name); return nullptr; } env->ReleaseStringUTFChars(jname, name); - if (!xbt_lib_get_level(storage, JAVA_STORAGE_LEVEL)) { /* native host not associated yet with java host */ - + if (java_storage_map.find(storage) == java_storage_map.end()) { /* Instantiate a new java storage */ jstorage = jstorage_new_instance(env); - if (!jstorage) { + if (not jstorage) { jxbt_throw_jni(env, "java storage instantiation failed"); return nullptr; } @@ -88,7 +81,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getByName(JNIEnv * env, j /* get a global reference to the newly created storage */ jstorage = jstorage_ref(env, jstorage); - if (!jstorage) { + if (not jstorage) { jxbt_throw_jni(env, "new global ref allocation failed"); return nullptr; } @@ -100,17 +93,18 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getByName(JNIEnv * env, j /* the native storage data field is set with the global reference to the * java storage returned by this function */ - xbt_lib_set(storage_lib, storage->key, JAVA_STORAGE_LEVEL, (void *) jstorage); - } + java_storage_map.insert({storage, jstorage}); + } else + jstorage = java_storage_map.at(storage); /* return the global reference to the java storage instance */ - return (jobject) xbt_lib_get_level(storage, JAVA_STORAGE_LEVEL); + return (jobject)jstorage; } JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getSize(JNIEnv * env,jobject jstorage) { msg_storage_t storage = jstorage_get_native(env, jstorage); - if (!storage) { + if (not storage) { jxbt_throw_notbound(env, "storage", jstorage); return -1; } @@ -121,7 +115,7 @@ JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getSize(JNIEnv * env,jobjec JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getFreeSize(JNIEnv * env,jobject jstorage) { msg_storage_t storage = jstorage_get_native(env, jstorage); - if (!storage) { + if (not storage) { jxbt_throw_notbound(env, "storage", jstorage); return -1; } @@ -132,7 +126,7 @@ JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getFreeSize(JNIEnv * env,jo JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getUsedSize(JNIEnv * env,jobject jstorage) { msg_storage_t storage = jstorage_get_native(env, jstorage); - if (!storage) { + if (not storage) { jxbt_throw_notbound(env, "storage", jstorage); return -1; } @@ -143,14 +137,14 @@ JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getUsedSize(JNIEnv * env,jo JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getProperty(JNIEnv *env, jobject jstorage, jobject jname) { msg_storage_t storage = jstorage_get_native(env, jstorage); - if (!storage) { + if (not storage) { jxbt_throw_notbound(env, "storage", jstorage); return nullptr; } const char *name = env->GetStringUTFChars((jstring) jname, 0); const char *property = MSG_storage_get_property_value(storage, name); - if (!property) { + if (not property) { return nullptr; } jobject jproperty = env->NewStringUTF(property); @@ -164,7 +158,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Storage_setProperty(JNIEnv *env, jobject jstorage, jobject jname, jobject jvalue) { msg_storage_t storage = jstorage_get_native(env, jstorage); - if (!storage) { + if (not storage) { jxbt_throw_notbound(env, "storage", jstorage); return; } @@ -182,12 +176,12 @@ Java_org_simgrid_msg_Storage_setProperty(JNIEnv *env, jobject jstorage, jobject JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getHost(JNIEnv * env,jobject jstorage) { msg_storage_t storage = jstorage_get_native(env, jstorage); - if (!storage) { + if (not storage) { jxbt_throw_notbound(env, "storage", jstorage); return nullptr; } const char *host_name = MSG_storage_get_host(storage); - if (!host_name) { + if (not host_name) { return nullptr; } jobject jhost_name = env->NewStringUTF(host_name); @@ -208,22 +202,22 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Storage_all(JNIEnv * env, jc jclass cls = jxbt_get_class(env, "org/simgrid/msg/Storage"); - if (!cls) { + if (not cls) { return nullptr; } jtable = env->NewObjectArray((jsize) count, cls, nullptr); - if (!jtable) { + if (not jtable) { jxbt_throw_jni(env, "Storages table allocation failed"); return nullptr; } for (index = 0; index < count; index++) { storage = xbt_dynar_get_as(table,index,msg_storage_t); - jstorage = (jobject) (xbt_lib_get_level(storage, JAVA_STORAGE_LEVEL)); - - if (!jstorage) { + if (java_storage_map.find(storage) != java_storage_map.end()) { + jstorage = java_storage_map.at(storage); + } else { jname = env->NewStringUTF(MSG_storage_get_name(storage)); jstorage = Java_org_simgrid_msg_Storage_getByName(env, cls_arg, jname); } @@ -233,3 +227,5 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Storage_all(JNIEnv * env, jc xbt_dynar_free(&table); return jtable; } + +SG_END_DECL()