X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/38b4184589d2bebb56268dca0ec93738df8f0772..9a216a5d8f6778340084eb0aa79c46440c4cf3fd:/src/bindings/java/jmsg_as.cpp diff --git a/src/bindings/java/jmsg_as.cpp b/src/bindings/java/jmsg_as.cpp index e1d50eb384..7e129decfc 100644 --- a/src/bindings/java/jmsg_as.cpp +++ b/src/bindings/java/jmsg_as.cpp @@ -6,15 +6,19 @@ /* 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 "xbt/str.h" -#include "xbt/dict.h" +#include +#include +#include + +#include "simgrid/s4u/NetZone.hpp" +#include + #include "simgrid/msg.h" #include "jmsg_as.h" #include "jmsg_host.h" #include "jxbt_utilities.h" #include "jmsg.h" - XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); static jmethodID jas_method_As_constructor; @@ -33,16 +37,17 @@ void jas_unref(JNIEnv * env, jobject jas) { env->DeleteGlobalRef(jas); } -void jas_bind(jobject jas, msg_as_t as, JNIEnv * env) { - env->SetLongField(jas, jas_field_As_bind, (jlong) (uintptr_t) (as)); +void jas_bind(jobject jas, simgrid::s4u::NetZone* netzone, JNIEnv* env) +{ + env->SetLongField(jas, jas_field_As_bind, (jlong)(uintptr_t)(netzone)); } -msg_as_t jas_get_native(JNIEnv * env, jobject jas) { - return (msg_as_t) (uintptr_t) env->GetLongField(jas, jas_field_As_bind); +simgrid::s4u::NetZone* jas_get_native(JNIEnv* env, jobject jas) +{ + return (simgrid::s4u::NetZone*)(uintptr_t)env->GetLongField(jas, jas_field_As_bind); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_As_nativeInit(JNIEnv *env, jclass cls) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_As_nativeInit(JNIEnv *env, jclass cls) { jclass class_As = env->FindClass("org/simgrid/msg/As"); jas_method_As_constructor = env->GetMethodID(class_As, "", "()V"); jas_field_As_bind = jxbt_get_jfield(env,class_As, "bind", "J"); @@ -51,117 +56,108 @@ Java_org_simgrid_msg_As_nativeInit(JNIEnv *env, jclass cls) { } } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_As_getName(JNIEnv * env, jobject jas) { - msg_as_t as = jas_get_native(env, jas); - return env->NewStringUTF(MSG_environment_as_get_name(as)); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getName(JNIEnv * env, jobject jas) { + simgrid::s4u::NetZone* as = jas_get_native(env, jas); + return env->NewStringUTF(as->name()); } -JNIEXPORT jobjectArray JNICALL -Java_org_simgrid_msg_As_getSons(JNIEnv * env, jobject jas) { +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getSons(JNIEnv * env, jobject jas) { int index = 0; jobjectArray jtable; jobject tmp_jas; - msg_as_t tmp_as; - msg_as_t self_as = jas_get_native(env, jas); - - xbt_dict_t dict = MSG_environment_as_get_routing_sons(self_as); + simgrid::s4u::NetZone* tmp_as; + simgrid::s4u::NetZone* self_as = jas_get_native(env, jas); + + xbt_dict_t dict = self_as->children(); int count = xbt_dict_length(dict); jclass cls = env->FindClass("org/simgrid/msg/As"); - if (!cls) { - return NULL; - } + if (!cls) + return nullptr; - jtable = env->NewObjectArray((jsize) count, cls, NULL); + jtable = env->NewObjectArray(static_cast(count), cls, nullptr); if (!jtable) { jxbt_throw_jni(env, "Hosts table allocation failed"); - return NULL; + return nullptr; } - xbt_dict_cursor_t cursor=NULL; + xbt_dict_cursor_t cursor=nullptr; char *key; xbt_dict_foreach(dict,cursor,key,tmp_as) { tmp_jas = jas_new_instance(env); if (!tmp_jas) { jxbt_throw_jni(env, "java As instantiation failed"); - return NULL; + return nullptr; } tmp_jas = jas_ref(env, tmp_jas); if (!tmp_jas) { jxbt_throw_jni(env, "new global ref allocation failed"); - return NULL; + return nullptr; } jas_bind(tmp_jas, tmp_as, env); env->SetObjectArrayElement(jtable, index, tmp_jas); index++; - } return jtable; } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobject jas, jobject jname) { - msg_as_t as = jas_get_native(env, jas); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobject jas, jobject jname) { + simgrid::s4u::NetZone* as = jas_get_native(env, jas); if (!as) { jxbt_throw_notbound(env, "as", jas); - return NULL; + return nullptr; } - const char *name = env->GetStringUTFChars((jstring) jname, 0); + const char *name = env->GetStringUTFChars(static_cast(jname), 0); const char *property = MSG_environment_as_get_property_value(as, name); if (!property) { - return NULL; + return nullptr; } jobject jproperty = env->NewStringUTF(property); - env->ReleaseStringUTFChars((jstring) jname, name); + env->ReleaseStringUTFChars(static_cast(jname), name); return jproperty; } -JNIEXPORT jobjectArray JNICALL -Java_org_simgrid_msg_As_getHosts(JNIEnv * env, jobject jas) +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getHosts(JNIEnv * env, jobject jas) { - int index; jobjectArray jtable; jobject jhost; jstring jname; msg_host_t host; - msg_as_t as = jas_get_native(env, jas); + simgrid::s4u::NetZone* as = jas_get_native(env, jas); - xbt_dynar_t table = MSG_environment_as_get_hosts(as); + xbt_dynar_t table = as->hosts(); int count = xbt_dynar_length(table); jclass cls = jxbt_get_class(env, "org/simgrid/msg/Host"); - if (!cls) { - return NULL; - } - - jtable = env->NewObjectArray((jsize) count, cls, NULL); + if (!cls) + return nullptr; + + jtable = env->NewObjectArray(static_cast(count), cls, nullptr); if (!jtable) { jxbt_throw_jni(env, "Hosts table allocation failed"); - return NULL; + return nullptr; } - for (index = 0; index < count; index++) { - + for (int index = 0; index < count; index++) { host = xbt_dynar_get_as(table,index,msg_host_t); - jhost = (jobject) host->extension(JAVA_HOST_LEVEL); + jhost = static_cast(host->extension(JAVA_HOST_LEVEL)); if (!jhost) { - jname = env->NewStringUTF(MSG_host_get_name(host)); + jname = env->NewStringUTF(host->cname()); jhost = Java_org_simgrid_msg_Host_getByName(env, cls, jname); - /* FIXME: leak of jname ? */ + env->ReleaseStringUTFChars(static_cast(jname), host->cname()); } env->SetObjectArrayElement(jtable, index, jhost);