X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ef33b9c0c2c0e9c15c27fce82515a23e8aadc0ed..9c92907fc7a130fd6abc60b98791daa320742ba2:/src/bindings/java/jmsg_host.cpp

diff --git a/src/bindings/java/jmsg_host.cpp b/src/bindings/java/jmsg_host.cpp
index aa84bd2837..9e16cc0218 100644
--- a/src/bindings/java/jmsg_host.cpp
+++ b/src/bindings/java/jmsg_host.cpp
@@ -6,13 +6,20 @@
 /* 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/dynar.h>
+#include <xbt/log.h>
+#include <xbt/str.h>
+
+#include <surf/surf_routing.h>
+
+#include <simgrid/s4u/host.hpp>
+
 #include "simgrid/msg.h"
 #include "jmsg.h"
 #include "jmsg_host.h"
 #include "jxbt_utilities.h"
 #include "jmsg_storage.h"
-#include <surf/surf_routing.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
@@ -69,9 +76,9 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jcla
   jobject jhost;                /* global reference to the java host instance returned  */
 
   /* get the C string from the java string */
-  if (jname == NULL) {
+  if (jname == nullptr) {
     jxbt_throw_null(env,bprintf("No host can have a null name"));
-    return NULL;
+    return nullptr;
   }
   const char *name = env->GetStringUTFChars(jname, 0);
   /* get the host by name       (the hosts are created during the grid resolution) */
@@ -80,7 +87,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jcla
   if (!host) {                  /* invalid name */
     jxbt_throw_host_not_found(env, name);
     env->ReleaseStringUTFChars(jname, name);
-    return NULL;
+    return nullptr;
   }
   env->ReleaseStringUTFChars(jname, name);
 
@@ -90,7 +97,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jcla
 
     if (!jhost) {
       jxbt_throw_jni(env, "java host instantiation failed");
-      return NULL;
+      return nullptr;
     }
 
     /* get a global reference to the newly created host */
@@ -98,7 +105,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jcla
 
     if (!jhost) {
       jxbt_throw_jni(env, "new global ref allocation failed");
-      return NULL;
+      return nullptr;
     }
     /* Sets the java host name */
     env->SetObjectField(jhost, jhost_field_Host_name, jname);
@@ -126,7 +133,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jc
 
     if (!jhost) {
       jxbt_throw_jni(env, "java host instantiation failed");
-      return NULL;
+      return nullptr;
     }
 
     /* get a global reference to the newly created host */
@@ -134,7 +141,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jc
 
     if (!jhost) {
       jxbt_throw_jni(env, "global ref allocation failed");
-      return NULL;
+      return nullptr;
     }
     /* Sets the host name */
     const char *name = MSG_host_get_name(host);
@@ -194,13 +201,13 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getProperty(JNIEnv *env, job
 
   if (!host) {
     jxbt_throw_notbound(env, "host", jhost);
-    return NULL;
+    return nullptr;
   }
   const char *name = env->GetStringUTFChars((jstring) jname, 0);
 
   const char *property = MSG_host_get_property_value(host, name);
   if (!property) {
-    return NULL;
+    return nullptr;
   }
 
   jobject jproperty = env->NewStringUTF(property);
@@ -257,15 +264,16 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getMountedStorage(JNIEn
   int count = xbt_dict_length(dict);
   jclass cls = env->FindClass("org/simgrid/msg/Storage");
 
-  jtable = env->NewObjectArray((jsize) count, cls, NULL);
+  jtable = env->NewObjectArray((jsize) count, cls, nullptr);
 
   if (!jtable) {
    jxbt_throw_jni(env, "Storages table allocation failed");
-   return NULL;
+   return nullptr;
   }
 
-  xbt_dict_cursor_t cursor=NULL;
-  const char *mount_name, *storage_name;
+  xbt_dict_cursor_t cursor=nullptr;
+  const char* mount_name;
+  const char* storage_name;
 
   xbt_dict_foreach(dict,cursor,mount_name,storage_name) {
     jname = env->NewStringUTF(storage_name);
@@ -290,7 +298,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getAttachedStorage(JNIE
   xbt_dynar_t dyn = MSG_host_get_attached_storage_list(host);
   int count = xbt_dynar_length(dyn);
   jclass cls = jxbt_get_class(env, "java/lang/String");
-  jtable = env->NewObjectArray((jsize) count, cls, NULL);
+  jtable = env->NewObjectArray((jsize) count, cls, nullptr);
   int index;
   char *storage_name;
   jstring jstorage_name;
@@ -328,14 +336,14 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_all(JNIEnv * env, jclas
   jclass cls = jxbt_get_class(env, "org/simgrid/msg/Host");
 
   if (!cls) {
-    return NULL;
+    return nullptr;
   }
 
-  jtable = env->NewObjectArray((jsize) count, cls, NULL);
+  jtable = env->NewObjectArray((jsize) count, cls, nullptr);
 
   if (!jtable) {
     jxbt_throw_jni(env, "Hosts table allocation failed");
-    return NULL;
+    return nullptr;
   }
 
   for (index = 0; index < count; index++) {