X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1f6232c64d77147f9a47e29f85dbeee71e925b0b..01f4354d59ef70e1b57fb8f50a927b5566c47ce9:/src/jmsg_process.c?ds=sidebyside

diff --git a/src/jmsg_process.c b/src/jmsg_process.c
index dc3d26271b..8150939597 100644
--- a/src/jmsg_process.c
+++ b/src/jmsg_process.c
@@ -17,11 +17,11 @@ 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);
-        }
+  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)
@@ -79,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,
@@ -109,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) {
@@ -150,7 +146,6 @@ Java_org_simgrid_msg_Process_create(JNIEnv * env,
 						/*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);
 
@@ -270,10 +265,12 @@ 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;
 	}
   if (rv != MSG_OK) {
@@ -284,11 +281,13 @@ JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess,
                                      jdouble jseconds)
 {
-	MSG_error_t rv;
+  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) {
@@ -330,8 +329,9 @@ 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);
 }