Merge commit '4df273f15273f959fc9e6ed69d2bf5e607ec9bf7' into HEAD

[simgrid.git] / src / jmsg_host.h

diff --git a/src/jmsg_host.h b/src/jmsg_host.h
index 374d8ef..0dc01c2 100644 (file)
--- a/src/jmsg_host.h
+++ b/src/jmsg_host.h
@@ -1,6 +1,6 @@
 /* Functions related to the java host instances.                            */
 
-/* Copyright (c) 2007, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2012. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@ void jhost_unref(JNIEnv * env, jobject jhost);
  *                                             this class is not found the function throws the exception 
  *                                             NotSuchFieldException.  
  */
-void jhost_bind(jobject jhost, m_host_t host, JNIEnv * env);
+void jhost_bind(jobject jhost, msg_host_t host, JNIEnv * env);
 
 /**
  * This function returns a native host from a java host instance.
@@ -73,7 +73,7 @@ void jhost_bind(jobject jhost, m_host_t host, JNIEnv * env);
  *                                             this class is not found the function throws the exception 
  *                                             NotSuchFieldException.  
  */
-m_host_t jhost_get_native(JNIEnv * env, jobject jhost);
+msg_host_t jhost_get_native(JNIEnv * env, jobject jhost);
 
 /**
  * This function returns the name of a MSG host.
@@ -119,14 +119,6 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName
  */
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost
     (JNIEnv *, jclass);
-
-/*
- * Class               org_simgrid_msg_Host
- * Method              getName
- * Signature   ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_simgrid_msg_Host_getName
-    (JNIEnv *, jobject);
 /*
  * Class               org_simgrid_msg_Host
  * Method              getCount
@@ -150,7 +142,20 @@ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getSpeed
 JNIEXPORT jint JNICALL
 Java_org_simgrid_msg_Host_getLoad(JNIEnv * env,
                                        jobject jhost);
-
+/*
+ * Class        org_simgrid_msg_Host
+ * Method       getProperty
+ * Signature    (Ljava/lang/String;)Ljava/lang/String;
+ */
+JNIEXPORT jobject JNICALL
+Java_org_simgrid_msg_Host_getProperty(JNIEnv *env, jobject jhost, jobject jname);
+/*
+ * Class        org_simgrid_msg_Host
+ * Method       setProperty
+ * Signature    (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ */
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Host_setProperty(JNIEnv *env, jobject jhost, jobject jname, jobject jvalue);
 /*
  * Class               org_simgrid_msg_Host
  * Method              isAvail