X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6068c9f0036786cdcbeb273d495e5aa378cb5f92..ac1f31a10a723b385c6e4df346fe5ac2b18cda1b:/src/jmsg_process.c

diff --git a/src/jmsg_process.c b/src/jmsg_process.c
index 213b345fbc..8150939597 100644
--- a/src/jmsg_process.c
+++ b/src/jmsg_process.c
@@ -11,9 +11,19 @@
 #include "jmsg_host.h"
 #include "jxbt_utilities.h"
 #include "smx_context_java.h"
+#include "smx_context_cojava.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Process_exit(JNIEnv *env, jobject jprocess) {
+  if (smx_factory_initializer_to_use == SIMIX_ctx_cojava_factory_init) {
+    m_process_t process = jprocess_to_native_process(jprocess, env);
+    smx_context_t context = MSG_process_get_smx_ctx(process);
+    smx_ctx_cojava_stop(context);
+  }
+}
+
 jobject native_to_java_process(m_process_t process)
 {
   return ((smx_ctx_java_t)MSG_process_get_smx_ctx(process))->jprocess;
@@ -43,7 +53,7 @@ m_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env)
 
 void jprocess_bind(jobject jprocess, m_process_t process, JNIEnv * env)
 {
-  (*env)->SetLongField(env, jprocess, jprocess_field_Process_bind, (jlong) (long) (process));
+  (*env)->SetLongField(env, jprocess, jprocess_field_Process_bind, (jlong)(process));
 }
 
 jlong jprocess_get_id(jobject jprocess, JNIEnv * env)
@@ -69,19 +79,19 @@ jboolean jprocess_is_valid(jobject jprocess, JNIEnv * env)
 }
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_nativeInit(JNIEnv *env, jclass cls) {
-	jclass jprocess_class_Process = (*env)->FindClass(env, "org/simgrid/msg/Process");
-
-	jprocess_field_Process_name = jxbt_get_jfield(env, jprocess_class_Process, "name", "Ljava/lang/String;");
-	jprocess_field_Process_bind = jxbt_get_jfield(env, jprocess_class_Process, "bind", "J");
-	jprocess_field_Process_id = jxbt_get_jfield(env, jprocess_class_Process, "id", "J");
-	jprocess_field_Process_pid = jxbt_get_jfield(env, jprocess_class_Process, "pid", "I");
-	jprocess_field_Process_ppid = jxbt_get_jfield(env, jprocess_class_Process, "ppid", "I");
-	jprocess_field_Process_host = jxbt_get_jfield(env, jprocess_class_Process, "host", "Lorg/simgrid/msg/Host;");
-	jprocess_field_Process_killTime = jxbt_get_jfield(env, jprocess_class_Process, "killTime", "D");
-	if (!jprocess_class_Process || !jprocess_field_Process_id || !jprocess_field_Process_name || !jprocess_field_Process_pid ||
-			!jprocess_field_Process_ppid || !jprocess_field_Process_host) {
-  	jxbt_throw_native(env,bprintf("Can't find some fields in Java class. You should report this bug."));
-	}
+  jclass jprocess_class_Process = (*env)->FindClass(env, "org/simgrid/msg/Process");
+
+  jprocess_field_Process_name = jxbt_get_jfield(env, jprocess_class_Process, "name", "Ljava/lang/String;");
+  jprocess_field_Process_bind = jxbt_get_jfield(env, jprocess_class_Process, "bind", "J");
+  jprocess_field_Process_id = jxbt_get_jfield(env, jprocess_class_Process, "id", "J");
+  jprocess_field_Process_pid = jxbt_get_jfield(env, jprocess_class_Process, "pid", "I");
+  jprocess_field_Process_ppid = jxbt_get_jfield(env, jprocess_class_Process, "ppid", "I");
+  jprocess_field_Process_host = jxbt_get_jfield(env, jprocess_class_Process, "host", "Lorg/simgrid/msg/Host;");
+  jprocess_field_Process_killTime = jxbt_get_jfield(env, jprocess_class_Process, "killTime", "D");
+  if (!jprocess_class_Process || !jprocess_field_Process_id || !jprocess_field_Process_name || !jprocess_field_Process_pid ||
+      !jprocess_field_Process_ppid || !jprocess_field_Process_host) {
+    jxbt_throw_native(env,bprintf("Can't find some fields in Java class. You should report this bug."));
+  }
 }
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_create(JNIEnv * env,
@@ -99,10 +109,6 @@ Java_org_simgrid_msg_Process_create(JNIEnv * env,
 
   hostname = (*env)->GetStringUTFChars(env, jhostname, 0);
 
-  XBT_DEBUG("Java_org_simgrid_msg_MsgNative_processCreate(env=%p,jproc=%p,host=%s)",
-	 env, jprocess_arg, hostname);
-
-
   /* get the name of the java process */
   jname = jprocess_get_name(jprocess_arg, env);
   if (!jname) {
@@ -137,11 +143,9 @@ Java_org_simgrid_msg_Process_create(JNIEnv * env,
 						(xbt_main_func_t) jprocess,
 						/*data*/ jprocess,
 						host,
-						(double)jkill, /* kill time */
 						/*argc, argv, properties*/
 						0,NULL,NULL);
-
-  MSG_process_set_data(process,&process);
+  MSG_process_set_kill_time(process, (double)jkill);
   /* bind the java process instance to the native process */
   jprocess_bind(jprocess, process, env);
 
@@ -207,7 +211,7 @@ Java_org_simgrid_msg_Process_currentProcess(JNIEnv * env, jclass cls)
 }
 
 JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Process_pause(JNIEnv * env,
+Java_org_simgrid_msg_Process_suspend(JNIEnv * env,
                                    jobject jprocess)
 {
   m_process_t process = jprocess_to_native_process(jprocess, env);
@@ -225,7 +229,7 @@ Java_org_simgrid_msg_Process_pause(JNIEnv * env,
 
 }
 JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Process_restart(JNIEnv * env,
+Java_org_simgrid_msg_Process_resume(JNIEnv * env,
                                      jobject jprocess)
 {
   m_process_t process = jprocess_to_native_process(jprocess, env);
@@ -261,34 +265,34 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep
 
 	double time =  jmillis / 1000 + jnanos / 1000;
 	MSG_error_t rv;
+	xbt_ex_t e;
 	TRY {
 		rv = MSG_process_sleep(time);
 	}
-	CATCH_ANONYMOUS {
+	CATCH(e) {
+	    xbt_ex_free(e);
 		return;
 	}
-	jxbt_check_res("MSG_process_sleep()", rv, MSG_OK,
-                 bprintf("unexpected error , please report this bug"));
+  if (rv != MSG_OK) {
+  	jmsg_throw_status(env,rv);
+  }
 }
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess,
                                      jdouble jseconds)
 {
-  m_process_t process = jprocess_to_native_process(jprocess, env);
-
-  if (!process) {
-    jxbt_throw_notbound(env, "process", jprocess);
-    return;
-  }
   MSG_error_t rv;
+  xbt_ex_t e;
   TRY {
-  	 rv = MSG_process_sleep((double)jseconds);
+   rv = MSG_process_sleep((double)jseconds);
   }
-  CATCH_ANONYMOUS {
+  CATCH(e) {
+    xbt_ex_free(e);
   	return;
   }
   if (rv != MSG_OK) {
-//  	smx_ctx_java_stop(smx_ctx_java_self());
+  	XBT_INFO("Status NOK");
+  	jmsg_throw_status(env,rv);
   }
 }
 
@@ -325,8 +329,14 @@ Java_org_simgrid_msg_Process_migrate(JNIEnv * env,
 
   /* try to change the host of the process */
   MSG_error_t rv = MSG_process_migrate(process, host);
-  jxbt_check_res("MSG_process_migrate()", rv, MSG_OK,
-                 bprintf("unexpected error , please report this bug"));
+  if (rv != MSG_OK) {
+    jmsg_throw_status(env,rv);
+  }
   /* change the host java side */
   (*env)->SetObjectField(env, jprocess, jprocess_field_Process_host, jhost);
 }
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Process_setKillTime (JNIEnv *env , jobject jprocess, jdouble jkilltime) {
+	m_process_t process = jprocess_to_native_process(jprocess, env);
+	MSG_process_set_kill_time(process, (double)jkilltime);
+}