Adapt to the latest changes in MSG API

[simgrid.git] / src / jmsg_host.c

diff --git a/src/jmsg_host.c b/src/jmsg_host.c
index fb3cdec..a48364d 100644 (file)
--- a/src/jmsg_host.c
+++ b/src/jmsg_host.c
@@ -31,16 +31,16 @@ void jhost_unref(JNIEnv * env, jobject jhost) {
   (*env)->DeleteGlobalRef(env, jhost);
 }
 
-void jhost_bind(jobject jhost, m_host_t host, JNIEnv * env) {
+void jhost_bind(jobject jhost, msg_host_t host, JNIEnv * env) {
   (*env)->SetLongField(env, jhost, jhost_field_Host_bind, (jlong) (long) (host));
 }
 
-m_host_t jhost_get_native(JNIEnv * env, jobject jhost) {
-  return (m_host_t) (long) (*env)->GetLongField(env, jhost, jhost_field_Host_bind);
+msg_host_t jhost_get_native(JNIEnv * env, jobject jhost) {
+  return (msg_host_t) (long) (*env)->GetLongField(env, jhost, jhost_field_Host_bind);
 }
 
 const char *jhost_get_name(jobject jhost, JNIEnv * env) {
-  m_host_t host = jhost_get_native(env, jhost);
+  msg_host_t host = jhost_get_native(env, jhost);
   return MSG_host_get_name(host);
 }
 
@@ -54,19 +54,18 @@ jboolean jhost_is_valid(jobject jhost, JNIEnv * env) {
 
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Host_nativeInit(JNIEnv *env, jclass cls) {
-       jclass class_Host = (*env)->FindClass(env, "org/simgrid/msg/Host");
-       jhost_method_Host_constructor = (*env)->GetMethodID(env, class_Host, "<init>", "()V");
-       //FIXME: Don't use jxbt_get_sfield directly, it is slower.
-       jhost_field_Host_bind = jxbt_get_sfield(env,"org/simgrid/msg/Host", "bind", "J");
-       jhost_field_Host_name = jxbt_get_jfield(env, class_Host, "name", "Ljava/lang/String;");
-       if (!class_Host || !jhost_field_Host_name || !jhost_method_Host_constructor || !jhost_field_Host_bind) {
-       jxbt_throw_native(env,bprintf("Can't find some fields in Java class. You should report this bug."));
-       }
+  jclass class_Host = (*env)->FindClass(env, "org/simgrid/msg/Host");
+  jhost_method_Host_constructor = (*env)->GetMethodID(env, class_Host, "<init>", "()V");
+  jhost_field_Host_bind = jxbt_get_jfield(env,class_Host, "bind", "J");
+  jhost_field_Host_name = jxbt_get_jfield(env, class_Host, "name", "Ljava/lang/String;");
+  if (!class_Host || !jhost_field_Host_name || !jhost_method_Host_constructor || !jhost_field_Host_bind) {
+    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) {
-  m_host_t host;                /* native host                                          */
+  msg_host_t host;                /* native host                                          */
   jobject jhost;                /* global reference to the java host instance returned  */
 
   /* get the C string from the java string */
@@ -75,10 +74,8 @@ Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls,
        jxbt_throw_null(env,bprintf("No host can have a null name"));
        return NULL;
   }
-  XBT_DEBUG("Looking for host '%s'",name);
   /* get the host by name       (the hosts are created during the grid resolution) */
   host = MSG_get_host_by_name(name);
-  XBT_DEBUG("MSG gave %p as native host", host);
 
   if (!host) {                  /* invalid name */
     jxbt_throw_host_not_found(env, name);
@@ -123,7 +120,7 @@ JNIEXPORT jobject JNICALL
 Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jclass cls) {
   jobject jhost;
 
-  m_host_t host = MSG_host_self();
+  msg_host_t host = MSG_host_self();
 
   if (!MSG_host_get_data(host)) {
     /* the native host not yet associated with the java host instance */
@@ -156,25 +153,6 @@ Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jclass cls) {
 
   return jhost;
 }
-
-JNIEXPORT jstring JNICALL
-Java_org_simgrid_msg_Host_getName(JNIEnv * env,
-                                  jobject jhost) {
-  m_host_t host = jhost_get_native(env, jhost);
-  const char* name;
-
-  if (!host) {
-    jxbt_throw_notbound(env, "host", jhost);
-    return NULL;
-  }
-
-  name = MSG_host_get_name(host);
-  if (!name)
-         xbt_die("This host has no name...");
-
-  return (*env)->NewStringUTF(env, name);
-}
-
 JNIEXPORT jint JNICALL
 Java_org_simgrid_msg_Host_getCount(JNIEnv * env, jclass cls) {
   xbt_dynar_t hosts =  MSG_hosts_as_dynar();
@@ -186,7 +164,7 @@ Java_org_simgrid_msg_Host_getCount(JNIEnv * env, jclass cls) {
 JNIEXPORT jdouble JNICALL
 Java_org_simgrid_msg_Host_getSpeed(JNIEnv * env,
                                         jobject jhost) {
-  m_host_t host = jhost_get_native(env, jhost);
+  msg_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
     jxbt_throw_notbound(env, "host", jhost);
@@ -197,7 +175,7 @@ Java_org_simgrid_msg_Host_getSpeed(JNIEnv * env,
 }
 JNIEXPORT jint JNICALL
 Java_org_simgrid_msg_Host_getLoad(JNIEnv * env, jobject jhost) {
-  m_host_t host = jhost_get_native(env, jhost);
+  msg_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
     jxbt_throw_notbound(env, "host", jhost);
@@ -208,7 +186,7 @@ Java_org_simgrid_msg_Host_getLoad(JNIEnv * env, jobject jhost) {
 }
 JNIEXPORT jboolean JNICALL
 Java_org_simgrid_msg_Host_isAvail(JNIEnv * env, jobject jhost) {
-  m_host_t host = jhost_get_native(env, jhost);
+  msg_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
     jxbt_throw_notbound(env, "host", jhost);
@@ -225,7 +203,7 @@ Java_org_simgrid_msg_Host_all(JNIEnv * env, jclass cls_arg)
   jobjectArray jtable;
   jobject jhost;
   jstring jname;
-  m_host_t host;
+  msg_host_t host;
 
   xbt_dynar_t table =  MSG_hosts_as_dynar();
   int count = xbt_dynar_length(table);
@@ -244,7 +222,7 @@ Java_org_simgrid_msg_Host_all(JNIEnv * env, jclass cls_arg)
   }
 
   for (index = 0; index < count; index++) {
-    host = xbt_dynar_get_as(table,index,m_host_t);
+    host = xbt_dynar_get_as(table,index,msg_host_t);
     jhost = (jobject) (MSG_host_get_data(host));
 
     if (!jhost) {