X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/13e36e7d7378077df05f126c50f87108518a6ea7..0b01f817e1445c4df99323f45dd0208760a29b6c:/src/java/jmsg.c

diff --git a/src/java/jmsg.c b/src/java/jmsg.c
index 8b57c1c8d7..fbb122abbe 100644
--- a/src/java/jmsg.c
+++ b/src/java/jmsg.c
@@ -1,14 +1,11 @@
-/*
- * $Id$
- *
- * Copyright 2006,2007 Martin Quinson, Malek Cherier All right reserved. 
- *
- * This program is free software; you can redistribute it and/or modify it 
- * under the terms of the license (GNU LGPL) which comes with this package.
- *
- * This contains the implementation of the wrapper functions used to interface
- * the java object with the native functions of the MSG API.
- */
+/* Java Wrappers to the MSG API.                                            */
+
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+  * under the terms of the license (GNU LGPL) which comes with this package. */
+
 #include "msg/msg.h"
 #include "msg/private.h"
 #include "simix/private.h"
@@ -234,13 +231,13 @@ Java_simgrid_msg_MsgNative_processGetHost(JNIEnv * env, jclass cls,
 
   host = MSG_process_get_host(process);
 
-  if (!host->data) {
+  if (!MSG_host_get_data(host)) {
     jxbt_throw_jni(env, "MSG_process_get_host() failed");
     return NULL;
   }
 
   /* return the global reference to the java host instance */
-  return (jobject) host->data;
+  return (jobject) MSG_host_get_data(host);
 
 }
 
@@ -255,7 +252,7 @@ Java_simgrid_msg_MsgNative_processFromPID(JNIEnv * env, jclass cls, jint PID)
   }
 
   if (!native_to_java_process(process)) {
-    jxbt_throw_native(env, xbt_strdup("SIMIX_process_get_jprocess() failed"));
+    jxbt_throw_jni(env, "SIMIX_process_get_jprocess() failed");
     return NULL;
   }
 
@@ -299,14 +296,14 @@ Java_simgrid_msg_MsgNative_processSelf(JNIEnv * env, jclass cls)
   jobject jprocess;
 
   if (!process) {
-    jxbt_throw_native(env, xbt_strdup("MSG_process_self() failed"));
+    jxbt_throw_jni(env, xbt_strdup("MSG_process_self() failed"));
     return NULL;
   }
 
   jprocess = native_to_java_process(process);
 
   if (!jprocess)
-    jxbt_throw_native(env, xbt_strdup("SIMIX_process_get_jprocess() failed"));
+    jxbt_throw_jni(env, xbt_strdup("SIMIX_process_get_jprocess() failed"));
 
   return jprocess;
 }
@@ -323,8 +320,11 @@ Java_simgrid_msg_MsgNative_processChangeHost(JNIEnv * env, jclass cls,
   }
 
   /* try to change the host of the process */
-  if (MSG_OK != MSG_process_change_host(host))
-    jxbt_throw_native(env, xbt_strdup("MSG_process_change_host() failed"));
+  MSG_error_t rv = MSG_process_change_host(host);
+
+  jxbt_check_res("MSG_process_change_host()",rv,MSG_OK,
+      bprintf("unexpected error , please report this bug"));
+
 }
 
 JNIEXPORT void JNICALL
@@ -364,7 +364,7 @@ Java_simgrid_msg_MsgNative_hostGetByName(JNIEnv * env, jclass cls,
     return NULL;
   }
 
-  if (!host->data) {            /* native host not associated yet with java host */
+  if (!MSG_host_get_data(host)) {            /* native host not associated yet with java host */
 
     /* instanciate a new java host */
     jhost = jhost_new_instance(env);
@@ -388,11 +388,11 @@ Java_simgrid_msg_MsgNative_hostGetByName(JNIEnv * env, jclass cls,
     /* the native host data field is set with the global reference to the 
      * java host returned by this function 
      */
-    host->data = (void *) jhost;
+    MSG_host_get_data(host,(void *) jhost);
   }
 
   /* return the global reference to the java host instance */
-  return (jobject) host->data;
+  return (jobject) MSG_host_get_data(host);
 }
 
 JNIEXPORT jstring JNICALL
@@ -406,7 +406,7 @@ Java_simgrid_msg_MsgNative_hostGetName(JNIEnv * env, jclass cls,
     return NULL;
   }
 
-  return (*env)->NewStringUTF(env, host->name);
+  return (*env)->NewStringUTF(env, MSG_host_get_name(host));
 }
 
 JNIEXPORT jint JNICALL
@@ -422,7 +422,7 @@ Java_simgrid_msg_MsgNative_hostSelf(JNIEnv * env, jclass cls)
 
   m_host_t host = MSG_host_self();
 
-  if (!host->data) {
+  if (!MSG_host_get_data(host)) {
     /* the native host not yet associated with the java host instance */
 
     /* instanciate a new java host instance */
@@ -443,9 +443,9 @@ Java_simgrid_msg_MsgNative_hostSelf(JNIEnv * env, jclass cls)
 
     /* Bind & store it */
     jhost_bind(jhost, host, env);
-    host->data = (void *) jhost;
+    MSG_host_set_data(host,(void *) jhost);
   } else {
-    jhost = (jobject) host->data;
+    jhost = (jobject) MSG_host_get_data(host);
   }
 
   return jhost;
@@ -537,13 +537,7 @@ Java_simgrid_msg_MsgNative_taskCreate(JNIEnv * env, jclass cls, jobject jtask,
 
   /* bind & store the task */
   jtask_bind(jtask, task, env);
-
-  /* allocate a new global reference to the java task instance */
-  task->data = (void *) jtask_new_global_ref(jtask, env);
-
-  if (!task->data)
-    jxbt_throw_jni(env, "global ref allocation failed");
-
+  MSG_task_set_data(task,jtask);
 }
 
 JNIEXPORT void JNICALL
@@ -624,9 +618,9 @@ Java_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv * env, jclass cls,
   /* associate the java task object and the native task */
   jtask_bind(jtask, task, env);
 
-  task->data = (void *) jtask;
+  MSG_task_set_data(task,(void*) jtask);
 
-  if (!task->data)
+  if (!MSG_task_get_data(task))
     jxbt_throw_jni(env, "global ref allocation failed");
 }
 
@@ -661,12 +655,12 @@ Java_simgrid_msg_MsgNative_taskGetSource(JNIEnv * env, jclass cls,
 
   host = MSG_task_get_source(task);
 
-  if (!host->data) {
+  if (!MSG_host_get_data(host)) {
     jxbt_throw_jni(env, "MSG_task_get_source() failed");
     return NULL;
   }
 
-  return (jobject) host->data;
+  return (jobject) MSG_host_get_data(host);
 }
 
 
@@ -681,7 +675,7 @@ Java_simgrid_msg_MsgNative_taskGetName(JNIEnv * env, jclass cls,
     return NULL;
   }
 
-  return (*env)->NewStringUTF(env, task->name);
+  return (*env)->NewStringUTF(env, MSG_task_get_name(task));
 }
 
 JNIEXPORT void JNICALL
@@ -752,16 +746,12 @@ Java_simgrid_msg_MsgNative_taskDestroy(JNIEnv * env, jclass cls,
     jxbt_throw_notbound(env, "task", task);
     return;
   }
-  jtask = (jobject) task->data;
+  jtask = (jobject) MSG_task_get_data(task);
     
   MSG_error_t rv = MSG_task_destroy(task);
     
   jxbt_check_res("MSG_task_destroy()",rv,MSG_OK,
     bprintf("unexpected error , please report this bug"));
-
-
-  /* delete the global reference to the java task object */
-  jtask_delete_global_ref(jtask, env);
 }
 
 JNIEXPORT void JNICALL
@@ -834,31 +824,36 @@ Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs) {
 
 JNIEXPORT void JNICALL
   JNICALL Java_simgrid_msg_Msg_run(JNIEnv * env, jclass cls) {
-  xbt_fifo_item_t item = NULL;
-  m_host_t host = NULL;
+  MSG_error_t rv;
+  int index;//xbt_fifo_item_t item = NULL;
+  m_host_t *hosts;
   jobject jhost;
 
   /* Run everything */
-  if (MSG_OK != MSG_main()) {
-    jxbt_throw_native(env, xbt_strdup("MSG_main() failed"));
-  }
+  rv= MSG_main();
+    jxbt_check_res("MSG_main()",rv,MSG_OK,
+     bprintf("unexpected error : MSG_main() failed .. please report this bug "));
+
   DEBUG0
     ("MSG_main finished. Bail out before cleanup since there is a bug in this part.");
 
   DEBUG0("Clean java world");
   /* Cleanup java hosts */
-  xbt_fifo_foreach(msg_global->host, item, host, m_host_t) {
-    jhost = (jobject) host->data;
+  hosts = MSG_get_host_table();
+  for (index=0;index<MSG_get_host_number()-1;index++)
+  {
+    jhost = (jobject)hosts[index]->data;
+    if(jhost)
+    	jhost_unref(env,jhost);
 
-    if (jhost)
-      jhost_unref(env, jhost);
   }
 
   DEBUG0("Clean native world");
   /* cleanup native stuff */
-  if (MSG_OK != MSG_clean()){
-    jxbt_throw_native(env, xbt_strdup("MSG_main() failed"));
-  }
+  rv = MSG_OK != MSG_clean();
+  jxbt_check_res("MSG_clean()",rv,MSG_OK,
+       bprintf("unexpected error : MSG_clean() failed .. please report this bug "));
+
 }
 
 JNIEXPORT jint JNICALL
@@ -912,8 +907,8 @@ Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg)
   jstring jname;
   m_host_t host;
 
-  int count = xbt_fifo_size(msg_global->host);
-  m_host_t *table = (m_host_t *) xbt_fifo_to_array(msg_global->host);
+  int count = MSG_get_host_number();
+  m_host_t *table = MSG_get_host_table();
 
   jclass cls = jxbt_get_class(env, "simgrid/msg/Host");
 
@@ -930,10 +925,10 @@ Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg)
 
   for (index = 0; index < count; index++) {
     host = table[index];
-    jhost = (jobject) (host->data);
+    jhost = (jobject) (MSG_host_get_data(host));
 
     if (!jhost) {
-      jname = (*env)->NewStringUTF(env, host->name);
+      jname = (*env)->NewStringUTF(env, MSG_host_get_name(host));
 
       jhost = Java_simgrid_msg_MsgNative_hostGetByName(env, cls_arg, jname);
       /* FIXME: leak of jname ? */
@@ -968,7 +963,7 @@ Java_simgrid_msg_MsgNative_selectContextFactory(JNIEnv * env, jclass class,
   if (errmsg) {
     char *thrown = bprintf("xbt_select_context_factory() failed: %s", errmsg);
     free(errmsg);
-    jxbt_throw_native(env, thrown);
+    jxbt_throw_jni(env, thrown);
   }
 }
 
@@ -990,11 +985,13 @@ Java_simgrid_msg_MsgNative_taskSend(JNIEnv * env, jclass cls,
     return;
   }
 
+  /* Pass a global ref to the Jtask into the Ctask so that the receiver can use it */
+  MSG_task_set_data(task,(void *) (*env)->NewGlobalRef(env, jtask));
   rv = MSG_task_send_with_timeout(task, alias, (double) jtimeout);
 
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
-  jxbt_check_res("MSG_task_send_with_timeout()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT_FAILURE,
+  jxbt_check_res("MSG_task_send_with_timeout()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT,
     bprintf("while sending task %s to mailbox %s", MSG_task_get_name(task),alias));
 }
 
@@ -1014,11 +1011,13 @@ Java_simgrid_msg_MsgNative_taskSendBounded(JNIEnv * env, jclass cls,
 
   alias = (*env)->GetStringUTFChars(env, jalias, 0);
 
+  /* Pass a global ref to the Jtask into the Ctask so that the receiver can use it */
+  MSG_task_set_data(task,(void *) (*env)->NewGlobalRef(env, jtask));
   rv = MSG_task_send_bounded(task, alias, (double) jmaxRate);
 
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
-  jxbt_check_res("MSG_task_send_bounded()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT_FAILURE,
+  jxbt_check_res("MSG_task_send_bounded()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT,
     bprintf("while sending task %s to mailbox %s with max rate %f", MSG_task_get_name(task),alias,(double)jmaxRate));
     
 }
@@ -1031,6 +1030,7 @@ Java_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls,
   MSG_error_t rv;
   m_task_t task = NULL;
   m_host_t host = NULL;
+  jobject jtask_global, jtask_local;
   const char *alias;
 
   if (jhost) {
@@ -1045,13 +1045,19 @@ Java_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls,
   alias = (*env)->GetStringUTFChars(env, jalias, 0);
 
   rv = MSG_task_receive_ext(&task, alias, (double) jtimeout, host);
+  jtask_global = MSG_task_get_data(task);
+
+  /* Convert the global ref into a local ref so that the JVM can free the stuff */
+  jtask_local = (*env)->NewLocalRef(env, jtask_global);
+  (*env)->DeleteGlobalRef(env, jtask_global);
+  MSG_task_set_data(task,NULL);
 
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
-  jxbt_check_res("MSG_task_receive_ext()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT_FAILURE,
+  jxbt_check_res("MSG_task_receive_ext()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT,
     bprintf("while receiving from mailbox %s",alias));
 
-  return (jobject) task->data;
+  return (jobject) jtask_local;
 }
 
 JNIEXPORT jboolean JNICALL
@@ -1135,7 +1141,7 @@ Java_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
   japplication_handler_on_start_document();
 
   if (surf_parse())
-    jxbt_throw_native(env, xbt_strdup("surf_parse() failed"));
+    jxbt_throw_jni(env,"surf_parse() failed");
 
   surf_parse_close();