X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/27d8dc3659e116a12b48fbde02eb4d6ae27f6328..7b138f8b1ed3e8816eda5cb26deb71fe81b4087a:/src/bindings/java/jmsg_host.cpp

diff --git a/src/bindings/java/jmsg_host.cpp b/src/bindings/java/jmsg_host.cpp
index 8a710d5671..0dc3098e6f 100644
--- a/src/bindings/java/jmsg_host.cpp
+++ b/src/bindings/java/jmsg_host.cpp
@@ -54,8 +54,7 @@ jboolean jhost_is_valid(jobject jhost, JNIEnv * env) {
   }
 }
 
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Host_nativeInit(JNIEnv *env, jclass cls) {
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_nativeInit(JNIEnv *env, jclass cls) {
   jclass class_Host = env->FindClass("org/simgrid/msg/Host");
   jhost_method_Host_constructor = env->GetMethodID(class_Host, "<init>", "()V");
   jhost_field_Host_bind = jxbt_get_jfield(env,class_Host, "bind", "J");
@@ -64,16 +63,15 @@ Java_org_simgrid_msg_Host_nativeInit(JNIEnv *env, jclass cls) {
     jxbt_throw_native(env,bprintf("Can't find some fields in Java class. You should report this bug."));
   }
 }
-JNIEXPORT jobject JNICALL
-Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls,
-                                         jstring jname) {
+
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls, jstring jname) {
   msg_host_t host;                /* native host                                          */
   jobject jhost;                /* global reference to the java host instance returned  */
 
   /* get the C string from the java string */
-  if (jname == NULL) {
-  	jxbt_throw_null(env,bprintf("No host can have a null name"));
-  	return NULL;
+  if (jname == nullptr) {
+    jxbt_throw_null(env,bprintf("No host can have a null name"));
+    return nullptr;
   }
   const char *name = env->GetStringUTFChars(jname, 0);
   /* get the host by name       (the hosts are created during the grid resolution) */
@@ -82,18 +80,17 @@ Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls,
   if (!host) {                  /* invalid name */
     jxbt_throw_host_not_found(env, name);
     env->ReleaseStringUTFChars(jname, name);
-    return NULL;
+    return nullptr;
   }
   env->ReleaseStringUTFChars(jname, name);
 
-  if (!xbt_lib_get_level(host, JAVA_HOST_LEVEL)) {       /* native host not associated yet with java host */
-
+  if (!host->extension(JAVA_HOST_LEVEL)) {       /* native host not associated yet with java host */
     /* Instantiate a new java host */
     jhost = jhost_new_instance(env);
 
     if (!jhost) {
       jxbt_throw_jni(env, "java host instantiation failed");
-      return NULL;
+      return nullptr;
     }
 
     /* get a global reference to the newly created host */
@@ -101,30 +98,27 @@ Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls,
 
     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);
     /* bind the java host and the native host */
     jhost_bind(jhost, host, env);
 
-    /* the native host data field is set with the global reference to the
-     * java host returned by this function
-     */
-    xbt_lib_set(host_lib, host->key, JAVA_HOST_LEVEL, (void *) jhost);
+    /* the native host data field is set with the global reference to the java host returned by this function */
+    host->extension_set(JAVA_HOST_LEVEL, (void *)jhost);
   }
 
   /* return the global reference to the java host instance */
-  return (jobject) xbt_lib_get_level(host, JAVA_HOST_LEVEL);
+  return (jobject) host->extension(JAVA_HOST_LEVEL);
 }
 
-JNIEXPORT jobject JNICALL
-Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jclass cls) {
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jclass cls) {
   jobject jhost;
 
   msg_host_t host = MSG_host_self();
 
-  if (!xbt_lib_get_level(host, JAVA_HOST_LEVEL)) {
+  if (!host->extension(JAVA_HOST_LEVEL)) {
     /* the native host not yet associated with the java host instance */
 
     /* instanciate a new java host instance */
@@ -132,7 +126,7 @@ Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jclass cls) {
 
     if (!jhost) {
       jxbt_throw_jni(env, "java host instantiation failed");
-      return NULL;
+      return nullptr;
     }
 
     /* get a global reference to the newly created host */
@@ -140,7 +134,7 @@ Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jclass cls) {
 
     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);
@@ -148,37 +142,32 @@ Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jclass cls) {
     env->SetObjectField(jhost, jhost_field_Host_name, jname);
     /* Bind & store it */
     jhost_bind(jhost, host, env);
-    xbt_lib_set(host_lib, host->key, JAVA_HOST_LEVEL, (void *) jhost);
+    host->extension_set(JAVA_HOST_LEVEL, (void *) jhost);
   } else {
-    jhost = (jobject) xbt_lib_get_level(host, JAVA_HOST_LEVEL);
+    jhost = (jobject) host->extension(JAVA_HOST_LEVEL);
   }
 
   return jhost;
 }
 
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Host_on(JNIEnv *env, jobject jhost) {
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_on(JNIEnv *env, jobject jhost) {
   msg_host_t host = jhost_get_native(env, jhost);
   MSG_host_on(host);
 }
 
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Host_off(JNIEnv *env, jobject jhost) {
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_off(JNIEnv *env, jobject jhost) {
   msg_host_t host = jhost_get_native(env, jhost);
   MSG_host_off(host); 
 }
 
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_Host_getCount(JNIEnv * env, jclass cls) {
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_Host_getCount(JNIEnv * env, jclass cls) {
   xbt_dynar_t hosts =  MSG_hosts_as_dynar();
   int nb_host = xbt_dynar_length(hosts);
   xbt_dynar_free(&hosts);
   return (jint) nb_host;
 }
 
-JNIEXPORT jdouble JNICALL
-Java_org_simgrid_msg_Host_getSpeed(JNIEnv * env,
-                                        jobject jhost) {
+JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getSpeed(JNIEnv * env, jobject jhost) {
   msg_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
@@ -186,12 +175,10 @@ Java_org_simgrid_msg_Host_getSpeed(JNIEnv * env,
     return -1;
   }
 
-  return (jdouble) MSG_get_host_speed(host);
+  return (jdouble) MSG_host_get_speed(host);
 }
 
-JNIEXPORT jdouble JNICALL
-Java_org_simgrid_msg_Host_getCoreNumber(JNIEnv * env,
-                                        jobject jhost) {
+JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCoreNumber(JNIEnv * env, jobject jhost) {
   msg_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
@@ -202,30 +189,18 @@ Java_org_simgrid_msg_Host_getCoreNumber(JNIEnv * env,
   return (jdouble) MSG_host_get_core_number(host);
 }
 
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_Host_getLoad(JNIEnv * env, jobject jhost) {
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getProperty(JNIEnv *env, jobject jhost, jobject jname) {
   msg_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
     jxbt_throw_notbound(env, "host", jhost);
-    return -1;
-  }
-
-  return (jint) MSG_get_host_msgload(host);
-}
-JNIEXPORT jobject JNICALL
-Java_org_simgrid_msg_Host_getProperty(JNIEnv *env, jobject jhost, jobject jname) {
-  msg_host_t host = jhost_get_native(env, jhost);
-
-  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);
@@ -249,12 +224,12 @@ Java_org_simgrid_msg_Host_setProperty(JNIEnv *env, jobject jhost, jobject jname,
 
   MSG_host_set_property_value(host, name, value, xbt_free_f);
 
-  env->ReleaseStringUTFChars((jstring) jvalue, value);
+  env->ReleaseStringUTFChars((jstring) jvalue, value_java);
   env->ReleaseStringUTFChars((jstring) jname, name);
-
 }
-JNIEXPORT jboolean JNICALL
-Java_org_simgrid_msg_Host_isOn(JNIEnv * env, jobject jhost) {
+
+JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Host_isOn(JNIEnv * env, jobject jhost)
+{
   msg_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
@@ -265,9 +240,8 @@ Java_org_simgrid_msg_Host_isOn(JNIEnv * env, jobject jhost) {
   return (jboolean) MSG_host_is_on(host);
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_org_simgrid_msg_Host_getMountedStorage(JNIEnv * env, jobject jhost){
-
+JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getMountedStorage(JNIEnv * env, jobject jhost)
+{
   msg_host_t host = jhost_get_native(env, jhost);
   jobject jstorage;
   jstring jname;
@@ -278,33 +252,34 @@ Java_org_simgrid_msg_Host_getMountedStorage(JNIEnv * env, jobject jhost){
   }
 
   int index = 0;
-	jobjectArray jtable;
-	xbt_dict_t dict =  MSG_host_get_mounted_storage_list(host);
-	int count = xbt_dict_length(dict);
-	jclass cls = env->FindClass("org/simgrid/msg/Storage");
+  jobjectArray jtable;
+  xbt_dict_t dict =  MSG_host_get_mounted_storage_list(host);
+  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;
-	}
+  if (!jtable) {
+   jxbt_throw_jni(env, "Storages table allocation failed");
+   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);
-	  jstorage = Java_org_simgrid_msg_Storage_getByName(env,cls,jname);
-	  env->SetObjectArrayElement(jtable, index, jstorage);
+  xbt_dict_foreach(dict,cursor,mount_name,storage_name) {
+    jname = env->NewStringUTF(storage_name);
+    jstorage = Java_org_simgrid_msg_Storage_getByName(env,cls,jname);
+    env->SetObjectArrayElement(jtable, index, jstorage);
     index++;
-	}
-	xbt_dict_free(&dict);
-	return jtable;
+  }
+  xbt_dict_free(&dict);
+  return jtable;
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_org_simgrid_msg_Host_getAttachedStorage(JNIEnv * env, jobject jhost){
+JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getAttachedStorage(JNIEnv * env, jobject jhost)
+{
   msg_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
@@ -316,7 +291,7 @@ Java_org_simgrid_msg_Host_getAttachedStorage(JNIEnv * env, jobject jhost){
   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;
@@ -329,8 +304,8 @@ Java_org_simgrid_msg_Host_getAttachedStorage(JNIEnv * env, jobject jhost){
   return jtable;
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_org_simgrid_msg_Host_getStorageContent(JNIEnv * env, jobject jhost){
+JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getStorageContent(JNIEnv * env, jobject jhost)
+{
   msg_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
@@ -340,9 +315,7 @@ Java_org_simgrid_msg_Host_getStorageContent(JNIEnv * env, jobject jhost){
   return (jobjectArray)MSG_host_get_storage_content(host);
 }
 
-
-JNIEXPORT jobjectArray JNICALL
-Java_org_simgrid_msg_Host_all(JNIEnv * env, jclass cls_arg)
+JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_all(JNIEnv * env, jclass cls_arg)
 {
   int index;
   jobjectArray jtable;
@@ -356,25 +329,24 @@ Java_org_simgrid_msg_Host_all(JNIEnv * env, jclass cls_arg)
   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++) {
     host = xbt_dynar_get_as(table,index,msg_host_t);
-    jhost = (jobject) (xbt_lib_get_level(host, JAVA_HOST_LEVEL));
+    jhost = (jobject) host->extension(JAVA_HOST_LEVEL);
 
     if (!jhost) {
       jname = env->NewStringUTF(MSG_host_get_name(host));
 
-      jhost =
-      		Java_org_simgrid_msg_Host_getByName(env, cls_arg, jname);
+      jhost = Java_org_simgrid_msg_Host_getByName(env, cls_arg, jname);
       /* FIXME: leak of jname ? */
     }
 
@@ -384,11 +356,22 @@ Java_org_simgrid_msg_Host_all(JNIEnv * env, jclass cls_arg)
   return jtable;
 }
 
-JNIEXPORT void JNICALL 
-Java_org_simgrid_msg_Host_setAsyncMailbox(JNIEnv * env, jclass cls_arg, jobject jname){
-
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_setAsyncMailbox(JNIEnv * env, jclass cls_arg, jobject jname)
+{
   const char *name = env->GetStringUTFChars((jstring) jname, 0);
   MSG_mailbox_set_async(name);
   env->ReleaseStringUTFChars((jstring) jname, name);
+}
+
+#include "simgrid/plugins/energy.h"
+JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getConsumedEnergy (JNIEnv *env, jobject jhost)
+{
+  msg_host_t host = jhost_get_native(env, jhost);
+
+  if (!host) {
+    jxbt_throw_notbound(env, "host", jhost);
+    return 0;
+  }
 
+  return MSG_host_get_consumed_energy(host);
 }