X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/652eb99105d979fcd897c2f26cfbce0f7d81ecd3..ff976abdc0f201064cd0fb608c39990ba2656561:/src/bindings/java/jmsg_as.cpp

diff --git a/src/bindings/java/jmsg_as.cpp b/src/bindings/java/jmsg_as.cpp
index 8f7b031e7a..7e129decfc 100644
--- a/src/bindings/java/jmsg_as.cpp
+++ b/src/bindings/java/jmsg_as.cpp
@@ -6,8 +6,13 @@
 /* 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 <xbt/str.h>
+#include <xbt/dict.h>
+#include <xbt/dynar.h>
+
+#include "simgrid/s4u/NetZone.hpp"
+#include <simgrid/s4u/host.hpp>
+
 #include "simgrid/msg.h"
 #include "jmsg_as.h"
 #include "jmsg_host.h"
@@ -32,12 +37,14 @@ 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) {
@@ -50,24 +57,23 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_As_nativeInit(JNIEnv *env, jclass cl
 }
 
 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 = jas_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 = 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) {
+  if (!cls)
     return nullptr;
-  }
 
   jtable = env->NewObjectArray(static_cast<jsize>(count), cls, nullptr);
 
@@ -99,7 +105,7 @@ 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 = jas_get_native(env, jas);
 
   if (!as) {
     jxbt_throw_notbound(env, "as", jas);
@@ -121,21 +127,19 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobje
 
 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) {
+  if (!cls)
     return nullptr;
-  }
 
   jtable = env->NewObjectArray(static_cast<jsize>(count), cls, nullptr);
 
@@ -144,16 +148,16 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getHosts(JNIEnv * env, jo
     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 = static_cast<jobject>(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<jstring>(jname), host->cname());
     }
 
     env->SetObjectArrayElement(jtable, index, jhost);