X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/601b0b84937fb065edd43e83f755e2eae4a1de0e..5f6048cb018bff3560cdbb4da438474a5a23301e:/src/jmsg_host.c

diff --git a/src/jmsg_host.c b/src/jmsg_host.c
index 9707deb67f..8cd7da1837 100644
--- a/src/jmsg_host.c
+++ b/src/jmsg_host.c
@@ -1,27 +1,27 @@
 /* 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
   * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/str.h"
+#include "msg/msg.h"
 #include "jmsg.h"
 #include "jmsg_host.h"
 #include "jxbt_utilities.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
-jobject jhost_new_instance(JNIEnv * env) {
-
-  jclass cls = jxbt_get_class(env, "org/simgrid/msg/Host");
-  jmethodID constructor = jxbt_get_jmethod(env, cls, "<init>", "()V");
+static jmethodID jhost_method_Host_constructor;
+static jfieldID jhost_field_Host_bind;
+static jfieldID jhost_field_Host_name;
 
-  if (!constructor)
-    return NULL;
 
-  return (*env)->NewObject(env, cls, constructor);
+jobject jhost_new_instance(JNIEnv * env) {
+  jclass cls = jxbt_get_class(env, "org/simgrid/msg/Host");
+  return (*env)->NewObject(env, cls, jhost_method_Host_constructor);
 }
 
 jobject jhost_ref(JNIEnv * env, jobject jhost) {
@@ -32,46 +32,41 @@ void jhost_unref(JNIEnv * env, jobject jhost) {
   (*env)->DeleteGlobalRef(env, jhost);
 }
 
-void jhost_bind(jobject jhost, m_host_t host, JNIEnv * env) {
-  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Host", "bind", "J");
-
-  if (!id)
-    return;
-
-  (*env)->SetLongField(env, jhost, id, (jlong) (long) (host));
+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) {
-  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Host", "bind", "J");
-
-  if (!id)
-    return NULL;
-
-  return (m_host_t) (long) (*env)->GetLongField(env, jhost, id);
+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);
 }
 
 jboolean jhost_is_valid(jobject jhost, JNIEnv * env) {
-  jfieldID id = jxbt_get_sfield(env, "org/simgrid/msg/Host", "bind", "J");
-
-  if (!id)
-    return 0;
-
-  if ((*env)->GetLongField(env, jhost, id)) {
+  if ((*env)->GetLongField(env, jhost, jhost_field_Host_bind)) {
     return JNI_TRUE;
   } else {
     return JNI_FALSE;
   }
 }
 
+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");
+  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 */
@@ -80,10 +75,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);
@@ -109,7 +102,8 @@ Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls,
       jxbt_throw_jni(env, "new global ref allocation failed");
       return NULL;
     }
-
+    /* Sets the java host name */
+    (*env)->SetObjectField(env, jhost, jhost_field_Host_name, jname);
     /* bind the java host and the native host */
     jhost_bind(jhost, host, env);
 
@@ -127,7 +121,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 */
@@ -147,7 +141,10 @@ Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jclass cls) {
       jxbt_throw_jni(env, "global ref allocation failed");
       return NULL;
     }
-
+    /* Sets the host name */
+    const char *name = MSG_host_get_name(host);
+    jobject jname = (*env)->NewStringUTF(env,name);
+    (*env)->SetObjectField(env, jhost, jhost_field_Host_name, jname);
     /* Bind & store it */
     jhost_bind(jhost, host, env);
     MSG_host_set_data(host, (void *) jhost);
@@ -157,25 +154,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();
@@ -187,7 +165,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);
@@ -198,7 +176,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);
@@ -207,9 +185,48 @@ Java_org_simgrid_msg_Host_getLoad(JNIEnv * env, jobject jhost) {
 
   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;
+  }
+  const char *name = (*env)->GetStringUTFChars(env, jname, 0);
+
+  const char *property = MSG_host_get_property_value(host, name);
+  if (!property) {
+    return NULL;
+  }
+
+  jobject jproperty = (*env)->NewStringUTF(env, property);
+
+  (*env)->ReleaseStringUTFChars(env, jname, name);
+
+  return jproperty;
+}
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Host_setProperty(JNIEnv *env, jobject jhost, jobject jname, jobject jvalue) {
+  msg_host_t host = jhost_get_native(env, jhost);
+
+  if (!host) {
+    jxbt_throw_notbound(env, "host", jhost);
+    return;
+  }
+  const char *name = (*env)->GetStringUTFChars(env, jname, 0);
+  const char *value_java = (*env)->GetStringUTFChars(env, jvalue, 0);
+  char *value = strdup(value_java);
+
+  MSG_host_set_property_value(host,name,value,xbt_free);
+
+  (*env)->ReleaseStringUTFChars(env, jvalue, value);
+  (*env)->ReleaseStringUTFChars(env, jname, name);
+
+}
 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);
@@ -226,7 +243,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);
@@ -245,7 +262,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) {