X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1283307f26e739e654d195f81cceee5ce1683d99..51300d0678fe7d82885ad873f5d0a9413536676a:/src/bindings/java/jmsg_process.c

diff --git a/src/bindings/java/jmsg_process.c b/src/bindings/java/jmsg_process.c
index aaa73e70ef..2f6216eeba 100644
--- a/src/bindings/java/jmsg_process.c
+++ b/src/bindings/java/jmsg_process.c
@@ -15,6 +15,14 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
+jfieldID jprocess_field_Process_bind;
+jfieldID jprocess_field_Process_host;
+jfieldID jprocess_field_Process_killTime;
+jfieldID jprocess_field_Process_id;
+jfieldID jprocess_field_Process_name;
+jfieldID jprocess_field_Process_pid;
+jfieldID jprocess_field_Process_ppid;
+
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_exit(JNIEnv *env, jobject jprocess) {
   if (smx_factory_initializer_to_use == SIMIX_ctx_cojava_factory_init) {
@@ -48,17 +56,21 @@ void jprocess_join(jobject jprocess, JNIEnv * env)
 
 msg_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env)
 {
-  return (msg_process_t) (long) (*env)->GetLongField(env, jprocess, jprocess_field_Process_bind);
+  return
+    (msg_process_t)(intptr_t)(*env)->GetLongField(env, jprocess,
+                                                  jprocess_field_Process_bind);
 }
 
 void jprocess_bind(jobject jprocess, msg_process_t process, JNIEnv * env)
 {
-  (*env)->SetLongField(env, jprocess, jprocess_field_Process_bind, (jlong)(process));
+  (*env)->SetLongField(env, jprocess, jprocess_field_Process_bind,
+                       (intptr_t)process);
 }
 
 jlong jprocess_get_id(jobject jprocess, JNIEnv * env)
 {
-  return (*env)->GetLongField(env, jprocess, jprocess_field_Process_id);
+  return
+    (intptr_t)(*env)->GetLongField(env, jprocess, jprocess_field_Process_id);
 }
 
 jstring jprocess_get_name(jobject jprocess, JNIEnv * env)
@@ -120,7 +132,7 @@ Java_org_simgrid_msg_Process_create(JNIEnv * env,
   /* bind/retrieve the msg host */
   host = MSG_get_host_by_name(hostname);
 
-  if (!(host)) {    /* not binded */
+  if (!(host)) {    /* not bound */
     jxbt_throw_host_not_found(env, hostname);
     return;
   }
@@ -321,21 +333,13 @@ Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env,
 }
 
 JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Process_sleep
-	(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos) {
-
-	double time =  jmillis / 1000 + jnanos / 1000;
-	msg_error_t rv;
-	xbt_ex_t e;
-	TRY {
-		rv = MSG_process_sleep(time);
-	}
-	CATCH(e) {
-	    xbt_ex_free(e);
-		return;
-	}
+Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos)
+ {
+  double time =  jmillis / 1000 + jnanos / 1000;
+  msg_error_t rv;
+  rv = MSG_process_sleep(time);
   if (rv != MSG_OK) {
-  	jmsg_throw_status(env,rv);
+    jmsg_throw_status(env,rv);
   }
 }
 JNIEXPORT void JNICALL
@@ -343,17 +347,12 @@ Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess,
                                      jdouble jseconds)
 {
   msg_error_t rv;
-  xbt_ex_t e;
-  TRY {
-   rv = MSG_process_sleep((double)jseconds);
-  }
-  CATCH(e) {
-    xbt_ex_free(e);
-  	return;
-  }
+  rv = MSG_process_sleep((double)jseconds);
+  if ((*env)->ExceptionOccurred(env))
+    return;
   if (rv != MSG_OK) {
-  	XBT_INFO("Status NOK");
-  	jmsg_throw_status(env,rv);
+    XBT_DEBUG("Status NOK");
+    jmsg_throw_status(env,rv);
   }
 }
 
@@ -392,6 +391,7 @@ Java_org_simgrid_msg_Process_migrate(JNIEnv * env,
   msg_error_t rv = MSG_process_migrate(process, host);
   if (rv != MSG_OK) {
     jmsg_throw_status(env,rv);
+    return;
   }
   /* change the host java side */
   (*env)->SetObjectField(env, jprocess, jprocess_field_Process_host, jhost);