X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5cf915bd09762c921e587f376420993f216a239..69b64311b67fddc105da16faded6fecec9db45d3:/src/bindings/java/jmsg_as.cpp diff --git a/src/bindings/java/jmsg_as.cpp b/src/bindings/java/jmsg_as.cpp index df66f45f33..d814976a69 100644 --- a/src/bindings/java/jmsg_as.cpp +++ b/src/bindings/java/jmsg_as.cpp @@ -1,75 +1,80 @@ -/* Functions related to the java host instances. */ +/* Java bindings of the NetZones. */ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-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 "xbt/str.h" -#include "xbt/dict.h" -#include "simgrid/msg.h" +#include "simgrid/s4u/NetZone.hpp" +#include "simgrid/s4u/host.hpp" + #include "jmsg_as.h" #include "jmsg_host.h" #include "jxbt_utilities.h" #include "jmsg.h" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); + +SG_BEGIN_DECL() static jmethodID jas_method_As_constructor; static jfieldID jas_field_As_bind; -jobject jas_new_instance(JNIEnv * env) { +jobject jnetzone_new_instance(JNIEnv* env) +{ jclass cls = jxbt_get_class(env, "org/simgrid/msg/As"); return env->NewObject(cls, jas_method_As_constructor); } -jobject jas_ref(JNIEnv * env, jobject jas) { +jobject jnetzone_ref(JNIEnv* env, jobject jas) +{ return env->NewGlobalRef(jas); } -void jas_unref(JNIEnv * env, jobject jas) { +void jnetzone_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 jnetzone_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* jnetzone_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"); - if (!class_As || !jas_method_As_constructor || !jas_field_As_bind) { - jxbt_throw_native(env,bprintf("Can't find some fields in Java class. You should report this bug.")); - } + xbt_assert(class_As && jas_method_As_constructor && jas_field_As_bind, + "Native initialization of msg/AS failed. Please report that bug"); } 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)); + simgrid::s4u::NetZone* as = jnetzone_get_native(env, jas); + return env->NewStringUTF(as->name()); } 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 = jnetzone_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) { + if (!cls) return nullptr; - } - jtable = env->NewObjectArray((jsize) count, cls, nullptr); + jtable = env->NewObjectArray(static_cast(count), cls, nullptr); if (!jtable) { jxbt_throw_jni(env, "Hosts table allocation failed"); @@ -80,17 +85,17 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getSons(JNIEnv * env, job char *key; xbt_dict_foreach(dict,cursor,key,tmp_as) { - tmp_jas = jas_new_instance(env); + tmp_jas = jnetzone_new_instance(env); if (!tmp_jas) { jxbt_throw_jni(env, "java As instantiation failed"); return nullptr; } - tmp_jas = jas_ref(env, tmp_jas); + tmp_jas = jnetzone_ref(env, tmp_jas); if (!tmp_jas) { jxbt_throw_jni(env, "new global ref allocation failed"); return nullptr; } - jas_bind(tmp_jas, tmp_as, env); + jnetzone_bind(tmp_jas, tmp_as, env); env->SetObjectArrayElement(jtable, index, tmp_jas); index++; @@ -99,13 +104,13 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getSons(JNIEnv * env, job } JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobject jas, jobject jname) { - msg_as_t as = jas_get_native(env, jas); + simgrid::s4u::NetZone* as = jnetzone_get_native(env, jas); if (!as) { jxbt_throw_notbound(env, "as", jas); 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) { @@ -114,50 +119,45 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobje 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) { - int index; jobjectArray jtable; jobject jhost; jstring jname; - msg_host_t host; - msg_as_t as = jas_get_native(env, jas); - - xbt_dynar_t table = MSG_environment_as_get_hosts(as); - int count = xbt_dynar_length(table); + simgrid::s4u::NetZone* as = jnetzone_get_native(env, jas); jclass cls = jxbt_get_class(env, "org/simgrid/msg/Host"); - - if (!cls) { + std::vector* table = as->hosts(); + if (!cls) return nullptr; - } - jtable = env->NewObjectArray((jsize) count, cls, nullptr); + jtable = env->NewObjectArray(static_cast(table->size()), cls, nullptr); if (!jtable) { jxbt_throw_jni(env, "Hosts table allocation failed"); return nullptr; } - for (index = 0; index < count; index++) { - host = xbt_dynar_get_as(table,index,msg_host_t); - - jhost = (jobject) host->extension(JAVA_HOST_LEVEL); + int index = 0; + for (auto host : *table) { + 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); + index++; } - xbt_dynar_free(&table); return jtable; } + +SG_END_DECL()