Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Make simgrid-java buildable after MSG_process_create_with_environment prototype change
authorSamuel Lepetit <samuel.lepetit@inria.fr>
Tue, 29 May 2012 13:44:57 +0000 (15:44 +0200)
committerSamuel Lepetit <samuel.lepetit@inria.fr>
Tue, 29 May 2012 13:44:57 +0000 (15:44 +0200)
src/jmsg_process.c

index e20c317..ecb1890 100644 (file)
@@ -137,10 +137,9 @@ Java_org_simgrid_msg_Process_create(JNIEnv * env,
                                                (xbt_main_func_t) jprocess,
                                                /*data*/ jprocess,
                                                host,
                                                (xbt_main_func_t) jprocess,
                                                /*data*/ jprocess,
                                                host,
-                                               (double)jkill, /* kill time */
                                                /*argc, argv, properties*/
                                                0,NULL,NULL);
                                                /*argc, argv, properties*/
                                                0,NULL,NULL);
-
+  MSG_process_set_kill_time(process, (double)jkill);
   MSG_process_set_data(process,&process);
   /* bind the java process instance to the native process */
   jprocess_bind(jprocess, process, env);
   MSG_process_set_data(process,&process);
   /* bind the java process instance to the native process */
   jprocess_bind(jprocess, process, env);
@@ -275,7 +274,7 @@ JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess,
                                      jdouble jseconds)
 {
 Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess,
                                      jdouble jseconds)
 {
-  MSG_error_t rv;
+       MSG_error_t rv;
   TRY {
         rv = MSG_process_sleep((double)jseconds);
   }
   TRY {
         rv = MSG_process_sleep((double)jseconds);
   }