X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0e9c0448c6566825b170b98ecff716b098bda10e..e9f0018b823e34405847177b25a85d3facc30ae1:/src/bindings/java/jmsg_host.h

diff --git a/src/bindings/java/jmsg_host.h b/src/bindings/java/jmsg_host.h
index 92f1989125..5a342f2262 100644
--- a/src/bindings/java/jmsg_host.h
+++ b/src/bindings/java/jmsg_host.h
@@ -1,16 +1,18 @@
 /* Functions related to the java host instances.                            */
 
-/* Copyright (c) 2007-2013. The SimGrid Team.
+/* Copyright (c) 2007-2015. 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #ifndef MSG_JHOST_H
 #define MSG_JHOST_H
 
 #include <jni.h>
-#include "msg/msg.h"
+#include "simgrid/msg.h"
+
+SG_BEGIN_DECL()
 
 /**
  * This function returns a new java host instance.
@@ -159,14 +161,6 @@ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getSpeed
  */
 JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCoreNumber
     (JNIEnv *, jobject);
-/*
- * Class		org_simgrid_msg_Host
- * Method		getLoad
- * Signature	()I
- */
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_Host_getLoad(JNIEnv * env,
-                                       jobject jhost);
 /*
  * Class        org_simgrid_msg_Host
  * Method       getProperty
@@ -183,12 +177,33 @@ JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Host_setProperty(JNIEnv *env, jobject jhost, jobject jname, jobject jvalue);
 /*
  * Class		org_simgrid_msg_Host
- * Method		isAvail
+ * Method		isOn
  * Signature	()Z
  */
-JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Host_isAvail
+JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Host_isOn
     (JNIEnv *, jobject);
 
+
+/*
+ * Class		org_simgrid_msg_Host
+ * Method		getMountedStorage
+ * Signature: ()[Lorg/simgrid/msg/Storage;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getMountedStorage(JNIEnv * env, jobject jhost);
+
+/*
+ * Class		org_simgrid_msg_Host
+ * Method		getAttachedStorageList
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getAttachedStorage(JNIEnv * env, jobject jhost);
+
+/*
+ * Class		org_simgrid_msg_Host
+ * Method		getStorageContent
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getStorageContent(JNIEnv * env, jobject jhost);
+
+
 /**
  * Class org_simgrid_msg_Host
  * Method all
@@ -199,7 +214,10 @@ Java_org_simgrid_msg_Host_all(JNIEnv *, jclass);
 JNIEXPORT void JNICALL 
 Java_org_simgrid_msg_Host_setAsyncMailbox(JNIEnv * env, jclass cls_arg, jobject jname);
 
+JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getConsumedEnergy
+    (JNIEnv *, jobject);
 
 
 #endif                          /*!MSG_JHOST_H */
 
+SG_END_DECL()