export the energy plugin to the java world

[simgrid.git] / src / bindings / java / jmsg_host.h

diff --git a/src/bindings/java/jmsg_host.h b/src/bindings/java/jmsg_host.h
index 609b9a9..5a342f2 100644 (file)
--- a/src/bindings/java/jmsg_host.h
+++ b/src/bindings/java/jmsg_host.h
@@ -1,6 +1,6 @@
 /* Functions related to the java host instances.                            */
 
-/* Copyright (c) 2007-2014. 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
@@ -10,7 +10,9 @@
 #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
@@ -220,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()