use -1 as default kill time to make sure that our process don't get killed on startup

[simgrid.git] / src / jmsg.c

diff --git a/src/jmsg.c b/src/jmsg.c
index 323d3aa..997dfd0 100644 (file)
--- a/src/jmsg.c
+++ b/src/jmsg.c
@@ -7,7 +7,7 @@
   * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <msg/msg.h>
-#include <simix/context.h>
+#include <simgrid/simix.h>
 #include <surf/surfxml_parse.h>
 
 #include "smx_context_java.h"
@@ -61,18 +61,21 @@ static jobject native_to_java_process(m_process_t process)
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
                                          jobject jprocess_arg,
-                                         jobject jhost)
+                                         jobject jhostname)
 {
      
    
   jobject jprocess;             /* the global reference to the java process instance    */
   jstring jname;                /* the name of the java process instance                */
   const char *name;             /* the C name of the process                            */
+  const char *hostname;
   m_process_t process;          /* the native process to create                         */
   m_host_t host;                /* Where that process lives */
    
-  XBT_DEBUG("Java_org_simgrid_msg_MsgNative_processCreate(env=%p,cls=%p,jproc=%p,jhost=%p)",
-        env, cls, jprocess_arg, jhost);
+  hostname = (*env)->GetStringUTFChars(env, jhostname, 0);
+
+  XBT_DEBUG("Java_org_simgrid_msg_MsgNative_processCreate(env=%p,cls=%p,jproc=%p,host=%s)",
+        env, cls, jprocess_arg, hostname);
    
    
   /* get the name of the java process */
@@ -84,10 +87,10 @@ Java_org_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
   }
 
   /* bind/retrieve the msg host */
-  host = jhost_get_native(env, jhost);
+  host = MSG_get_host_by_name(hostname);
 
   if (!(host)) {    /* not binded */
-    jxbt_throw_notbound(env, "host", jhost);
+    jxbt_throw_host_not_found(env, hostname);
     return;
   }
 
@@ -107,6 +110,7 @@ Java_org_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
                                                (xbt_main_func_t) jprocess,
                                                /*data*/ NULL,
                                                host,
+                                               /* kill_time */-1,
                                                /*argc, argv, properties*/
                                                0,NULL,NULL);
      
@@ -115,6 +119,7 @@ Java_org_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
   /* release our reference to the process name (variable name becomes invalid) */
   //FIXME : This line should be uncommented but with mac it doesn't work. BIG WARNING
   //(*env)->ReleaseStringUTFChars(env, jname, name);
+  (*env)->ReleaseStringUTFChars(env, jhostname, hostname);
    
   /* bind the java process instance to the native process */
   jprocess_bind(jprocess, process, env);
@@ -354,7 +359,7 @@ Java_org_simgrid_msg_MsgNative_hostGetByName(JNIEnv * env, jclass cls,
   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 (simdata=%p)", host,host? host->simdata:NULL);
+  XBT_DEBUG("MSG gave %p as native host (smx_host=%p)", host,host? host->smx_host:NULL);
 
   if (!host) {                  /* invalid name */
     jxbt_throw_host_not_found(env, name);
@@ -849,7 +854,7 @@ JNIEXPORT void JNICALL
   /* Cleanup java hosts */
   hosts = MSG_hosts_as_dynar();
   for (index = 0; index < xbt_dynar_length(hosts) - 1; index++) {
-    jhost = (jobject) xbt_dynar_get_as(hosts,index,m_host_t)->data;
+    jhost = (jobject) MSG_host_get_data(xbt_dynar_get_as(hosts,index,m_host_t));
     if (jhost)
       jhost_unref(env, jhost);