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

diff --git a/src/java/jmsg.c b/src/java/jmsg.c
index 83900cc5ff..0d9ea2375c 100644
--- a/src/java/jmsg.c
+++ b/src/java/jmsg.c
@@ -17,18 +17,13 @@
 #include "jmsg_process.h"
 #include "jmsg_host.h"
 #include "jmsg_task.h"
-#include "jmsg_channel.h"
 #include "jmsg_application_handler.h"
 #include "jxbt_utilities.h"
 
-
 #include "jmsg.h"
-
 #include "msg/mailbox.h"
-
 #include "surf/surfxml_parse.h"
 
-
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
 static JavaVM *__java_vm = NULL;
@@ -55,7 +50,6 @@ static jobject native_to_java_process(m_process_t process)
           (process->simdata->s_process->context))->jprocess;
 }
 
-
 /*
  * The MSG process connected functions implementation.                                 
  */
@@ -125,12 +119,12 @@ Java_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
      process, process->simdata, process->simdata->m_host,
      process->simdata->m_host->simdata, env);
 
-  SIMIX_jprocess_create(process->name,
-                        process->simdata->m_host->simdata->smx_host,
-                        /*data */ (void *) process,
-                        jprocess, env, &process->simdata->s_process);
-
-
+  process->simdata->s_process = 
+    SIMIX_process_create(process->name, (xbt_main_func_t)jprocess, 
+                         /*data */ (void *) process,
+                         process->simdata->m_host->simdata->smx_host->name, 
+                         0, NULL, NULL);
+    
   DEBUG1("context created (s_process=%p)", process->simdata->s_process);
 
 
@@ -149,10 +143,7 @@ Java_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
           process->name);
 
   mailbox = MSG_mailbox_new(alias);
-  MSG_mailbox_set_hostname(mailbox,
-                           process->simdata->m_host->simdata->smx_host->name);
-
-
+  
 }
 
 JNIEXPORT void JNICALL
@@ -167,8 +158,11 @@ Java_simgrid_msg_MsgNative_processSuspend(JNIEnv * env, jclass cls,
   }
 
   /* try to suspend the process */
-  if (MSG_OK != MSG_process_suspend(process))
-    jxbt_throw_native(env, xbt_strdup("MSG_process_suspend() failed"));
+  MSG_error_t rv = MSG_process_suspend(process);
+  
+  jxbt_check_res("MSG_process_suspend()",rv,MSG_OK,
+    bprintf("unexpected error , please report this bug"));
+  
 }
 
 JNIEXPORT void JNICALL
@@ -178,13 +172,15 @@ Java_simgrid_msg_MsgNative_processResume(JNIEnv * env, jclass cls,
   m_process_t process = jprocess_to_native_process(jprocess, env);
 
   if (!process) {
-    jxbt_throw_notbound(env, "process", jprocess);
+    jxbt_throw_notbound(env,"process", jprocess);
     return;
   }
 
   /* try to resume the process */
-  if (MSG_OK != MSG_process_resume(process))
-    jxbt_throw_native(env, xbt_strdup("MSG_process_resume() failed"));
+    MSG_error_t rv = MSG_process_resume(process);
+    
+    jxbt_check_res("MSG_process_resume()",rv,MSG_OK,
+    bprintf("unexpected error , please report this bug"));
 }
 
 JNIEXPORT jboolean JNICALL
@@ -239,7 +235,7 @@ Java_simgrid_msg_MsgNative_processGetHost(JNIEnv * env, jclass cls,
   host = MSG_process_get_host(process);
 
   if (!host->data) {
-    jxbt_throw_native(env, xbt_strdup("MSG_process_get_host() failed"));
+    jxbt_throw_jni(env, "MSG_process_get_host() failed");
     return NULL;
   }
 
@@ -315,20 +311,6 @@ Java_simgrid_msg_MsgNative_processSelf(JNIEnv * env, jclass cls)
   return jprocess;
 }
 
-
-JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_processSelfPID(JNIEnv * env, jclass cls)
-{
-  return (jint) MSG_process_self_PID();
-}
-
-
-JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_processSelfPPID(JNIEnv * env, jclass cls)
-{
-  return (jint) MSG_process_self_PPID();
-}
-
 JNIEXPORT void JNICALL
 Java_simgrid_msg_MsgNative_processChangeHost(JNIEnv * env, jclass cls,
                                              jobject jhost)
@@ -349,10 +331,11 @@ JNIEXPORT void JNICALL
 Java_simgrid_msg_MsgNative_processWaitFor(JNIEnv * env, jclass cls,
                                           jdouble seconds)
 {
-  if (MSG_OK != MSG_process_sleep((double) seconds))
-    jxbt_throw_native(env,
-                      bprintf("MSG_process_change_host(%f) failed",
-                              (double) seconds));
+    MSG_error_t rv= MSG_process_sleep((double) seconds);
+    
+    jxbt_check_res("MSG_process_sleep()",rv, MSG_HOST_FAILURE,
+    bprintf("while process was waiting for %f seconds",(double)seconds));
+    
 }
 
 
@@ -522,7 +505,7 @@ Java_simgrid_msg_MsgNative_taskCreate(JNIEnv * env, jclass cls, jobject jtask,
                                       jdouble jmessageSize)
 {
   m_task_t task;                /* the native task to create                            */
-  const char *name;             /* the name of the task                                 */
+  const char *name=NULL;        /* the name of the task                                 */
 
   if (jcomputeDuration < 0) {
     jxbt_throw_illegal(env,
@@ -538,20 +521,19 @@ Java_simgrid_msg_MsgNative_taskCreate(JNIEnv * env, jclass cls, jobject jtask,
     return;
   }
 
-  if (!jname) {
-    jxbt_throw_null(env, xbt_strdup("Task name cannot be null"));
-    return;
+  if (jname) {
+    /* get the C string from the java string */
+    name = (*env)->GetStringUTFChars(env, jname, 0);
   }
 
-  /* get the C string from the java string */
-  name = (*env)->GetStringUTFChars(env, jname, 0);
 
   /* create the task */
   task =
     MSG_task_create(name, (double) jcomputeDuration, (double) jmessageSize,
                     NULL);
 
-  (*env)->ReleaseStringUTFChars(env, jname, name);
+  if (jname)
+    (*env)->ReleaseStringUTFChars(env, jname, name);
 
   /* bind & store the task */
   jtask_bind(jtask, task, env);
@@ -680,7 +662,7 @@ Java_simgrid_msg_MsgNative_taskGetSource(JNIEnv * env, jclass cls,
   host = MSG_task_get_source(task);
 
   if (!host->data) {
-    jxbt_throw_native(env, xbt_strdup("MSG_task_get_source() failed"));
+    jxbt_throw_jni(env, "MSG_task_get_source() failed");
     return NULL;
   }
 
@@ -712,8 +694,10 @@ Java_simgrid_msg_MsgNative_taskCancel(JNIEnv * env, jclass cls, jobject jtask)
     return;
   }
 
-  if (MSG_OK != MSG_task_cancel(ptask))
-    jxbt_throw_native(env, xbt_strdup("MSG_task_cancel() failed"));
+  MSG_error_t rv = MSG_task_cancel(ptask);
+  
+    jxbt_check_res("MSG_task_cancel()",rv,MSG_OK,
+    bprintf("unexpected error , please report this bug"));
 }
 
 JNIEXPORT jdouble JNICALL
@@ -769,9 +753,12 @@ Java_simgrid_msg_MsgNative_taskDestroy(JNIEnv * env, jclass cls,
     return;
   }
   jtask = (jobject) task->data;
+    
+  MSG_error_t rv = MSG_task_destroy(task);
+    
+  jxbt_check_res("MSG_task_destroy()",rv,MSG_OK,
+    bprintf("unexpected error , please report this bug"));
 
-  if (MSG_OK != MSG_task_destroy(task))
-    jxbt_throw_native(env, xbt_strdup("MSG_task_destroy() failed"));
 
   /* delete the global reference to the java task object */
   jtask_delete_global_ref(jtask, env);
@@ -788,124 +775,17 @@ Java_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls,
     return;
   }
 
-  if (MSG_OK != MSG_task_execute(task))
-    jxbt_throw_native(env, xbt_strdup("MSG_task_execute() failed"));
-}
-
-/***************************************************************************************
- * The Task reception functions                                                        *
- ***************************************************************************************/
-
-JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_taskGet(JNIEnv * env, jclass cls,
-                                   jint chan_id, jdouble jtimeout,
-                                   jobject jhost)
-{
-  m_task_t task = NULL;
-  m_host_t host = NULL;
-
-  if (jhost) {
-    host = jhost_get_native(env, jhost);
-    if (!host) {
-      jxbt_throw_notbound(env, "host", jhost);
-      return NULL;
-    }
-  }
-
-  if (MSG_OK !=
-      MSG_task_get_ext(&task, (int) chan_id, (double) jtimeout, host)) {
-    jxbt_throw_native(env, xbt_strdup("MSG_task_get_ext() failed"));
-    return NULL;
-  }
-
-  return (jobject) task->data;
-}
-
-
-JNIEXPORT jboolean JNICALL
-Java_simgrid_msg_MsgNative_taskProbe(JNIEnv * env, jclass cls, jint chan_id)
-{
-  return (jboolean) MSG_task_Iprobe(chan_id);
-}
-
-JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_taskGetCommunicatingProcess(JNIEnv * env,
-                                                       jclass cls,
-                                                       jint chan_id)
-{
-  int pid = MSG_task_probe_from(chan_id);
-  if (pid >= 0)
-    return Java_simgrid_msg_MsgNative_processFromPID(env, cls, (jint) pid);
-
-  return NULL;
-}
-
-JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_taskProbeHost(JNIEnv * env, jclass cls,
-                                         jobject jhost, jint chan_id)
-{
-  m_host_t host = jhost_get_native(env, jhost);
-
-  if (!host) {
-    jxbt_throw_notbound(env, "host", jhost);
-    return -1;
-  }
-
-  return (jint) MSG_task_probe_from_host(chan_id, host);
+  MSG_error_t rv = MSG_task_execute(task);
+  
+    jxbt_check_res("MSG_task_execute()",rv,MSG_HOST_FAILURE|MSG_TASK_CANCELLED,
+    bprintf("while executing task %s", MSG_task_get_name(task)));
 }
 
-
 /***************************************************************************************
- * The Task reception functions                                                        *
+ * Unsortable functions                                                        *
  ***************************************************************************************/
 
 
-JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_hostPut(JNIEnv * env, jclass cls,
-                                   jobject jhost, jint chan_id, jobject jtask,
-                                   jdouble jtimeout)
-{
-  m_task_t task = jtask_to_native_task(jtask, env);
-  m_host_t host = jhost_get_native(env, jhost);
-
-  if (!host) {
-    jxbt_throw_notbound(env, "host", jhost);
-    return;
-  }
-  if (!task) {
-    jxbt_throw_notbound(env, "task", jtask);
-    return;
-  }
-
-  if (MSG_OK !=
-      MSG_task_put_with_timeout(task, host, (int) chan_id, (double) jtimeout))
-    jxbt_throw_native(env, xbt_strdup("MSG_task_put_with_timeout() failed"));
-}
-
-
-
-JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_hostPutBounded(JNIEnv * env, jclass cls,
-                                          jobject jhost, jint chan_id,
-                                          jobject jtask, jdouble jmaxRate)
-{
-  m_task_t task = jtask_to_native_task(jtask, env);
-  m_host_t host = jhost_get_native(env, jhost);
-
-  if (!host) {
-    jxbt_throw_notbound(env, "host", jhost);
-    return;
-  }
-  if (!task) {
-    jxbt_throw_notbound(env, "task", jtask);
-    return;
-  }
-
-  if (MSG_OK !=
-      MSG_task_put_bounded(task, host, (int) chan_id, (double) jmaxRate))
-    jxbt_throw_native(env, xbt_strdup("MSG_task_put_bounded() failed"));
-}
-
 JNIEXPORT jint JNICALL
 Java_simgrid_msg_Msg_getErrCode(JNIEnv * env, jclass cls)
 {
@@ -920,9 +800,7 @@ Java_simgrid_msg_Msg_getClock(JNIEnv * env, jclass cls)
 
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
-{
-
+Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs) {
   char **argv = NULL;
   int index;
   int argc = 0;
@@ -933,23 +811,17 @@ Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
     argc = (int) (*env)->GetArrayLength(env, jargs);
 
   argc++;
-
   argv = xbt_new0(char *, argc);
-
   argv[0] = strdup("java");
 
   for (index = 0; index < argc - 1; index++) {
     jval = (jstring) (*env)->GetObjectArrayElement(env, jargs, index);
-
     tmp = (*env)->GetStringUTFChars(env, jval, 0);
-
     argv[index + 1] = strdup(tmp);
-
     (*env)->ReleaseStringUTFChars(env, jval, tmp);
   }
 
   MSG_global_init(&argc, argv);
-  MSG_set_channel_number(10);   /* FIXME: this should not be fixed statically */
   SIMIX_context_select_factory("java");
 
   for (index = 0; index < argc; index++)
@@ -958,20 +830,18 @@ Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
   free(argv);
 
   (*env)->GetJavaVM(env, &__java_vm);
-
 }
 
 JNIEXPORT void JNICALL
-  JNICALL Java_simgrid_msg_Msg_run(JNIEnv * env, jclass cls)
-{
+  JNICALL Java_simgrid_msg_Msg_run(JNIEnv * env, jclass cls) {
   xbt_fifo_item_t item = NULL;
   m_host_t host = NULL;
   jobject jhost;
 
   /* Run everything */
-  if (MSG_OK != MSG_main())
+  if (MSG_OK != MSG_main()) {
     jxbt_throw_native(env, xbt_strdup("MSG_main() failed"));
-
+  }
   DEBUG0
     ("MSG_main finished. Bail out before cleanup since there is a bug in this part.");
 
@@ -986,9 +856,9 @@ JNIEXPORT void JNICALL
 
   DEBUG0("Clean native world");
   /* cleanup native stuff */
-  if (MSG_OK != MSG_clean())
+  if (MSG_OK != MSG_clean()){
     jxbt_throw_native(env, xbt_strdup("MSG_main() failed"));
-
+  }
 }
 
 JNIEXPORT jint JNICALL
@@ -1022,20 +892,9 @@ Java_simgrid_msg_MsgNative_processExit(JNIEnv * env, jclass cls,
     return;
   }
 
-  SIMIX_context_stop(0);
-}
-
-JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_pajeOutput(JNIEnv * env, jclass cls, jstring jpajeFile)
-{
-  const char *pajeFile = (*env)->GetStringUTFChars(env, jpajeFile, 0);
-
-  MSG_paje_output(pajeFile);
-
-  (*env)->ReleaseStringUTFChars(env, jpajeFile, pajeFile);
+  SIMIX_context_stop(SIMIX_process_self()->context);
 }
 
-
 JNIEXPORT void JNICALL
 Java_simgrid_msg_Msg_info(JNIEnv * env, jclass cls, jstring js)
 {
@@ -1135,9 +994,8 @@ Java_simgrid_msg_MsgNative_taskSend(JNIEnv * env, jclass cls,
 
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
-  if (MSG_OK != rv)
-    jxbt_throw_native(env, xbt_strdup("MSG_task_send_with_timeout() failed"));
-
+  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));
 }
 
 JNIEXPORT void JNICALL
@@ -1160,8 +1018,9 @@ Java_simgrid_msg_MsgNative_taskSendBounded(JNIEnv * env, jclass cls,
 
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
-  if (MSG_OK != rv)
-    jxbt_throw_native(env, xbt_strdup("MSG_task_send_bounded() failed"));
+  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));
+    
 }
 
 JNIEXPORT jobject JNICALL
@@ -1189,10 +1048,8 @@ Java_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls,
 
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
-  if (MSG_OK != rv) {
-    jxbt_throw_native(env, xbt_strdup("MSG_task_receive_ext() failed"));
-    return NULL;
-  }
+  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;
 }
@@ -1218,7 +1075,6 @@ JNIEXPORT jint JNICALL
 Java_simgrid_msg_MsgNative_taskListenFromHost(JNIEnv * env, jclass cls,
                                               jstring jalias, jobject jhost)
 {
-
   int rv;
   const char *alias;
 
@@ -1228,7 +1084,6 @@ Java_simgrid_msg_MsgNative_taskListenFromHost(JNIEnv * env, jclass cls,
     jxbt_throw_notbound(env, "host", jhost);
     return -1;
   }
-
   alias = (*env)->GetStringUTFChars(env, jalias, 0);
 
   rv = MSG_task_listen_from_host(alias, host);