Adapt to the latest changes in MSG API

diff --git a/doc/install.doc b/doc/install.doc
index 83fe1ed..e9426be 100644 (file)
--- a/doc/install.doc
+++ b/doc/install.doc
@@ -58,5 +58,14 @@ $ cd examples
 $ java -cp .:../simgrid.jar basic/BasicTest platform.xml basic/basicDeployment.xml
 \endverbatim
 
+\section bindings_binding_java_coroutines How to use the coroutines context factory
+
+First, remember that the coroutines context factory is still experimental work.
+
+To use the coroutines context factory, you need a Java virtual machine which supports it.
+
+Our implementation rely on a JVM patch made by Lukas Stadler, which you can find <a href="http://ssw.jku.at/General/Staff/LS/coro/">here</a>.
+
+
  
  */

diff --git a/src/jmsg.c b/src/jmsg.c
index 3e6fd62..620a427 100644 (file)
--- a/src/jmsg.c
+++ b/src/jmsg.c
@@ -50,7 +50,7 @@ JNIEnv *get_current_thread_env(void)
   return env;
 }
 
-void jmsg_throw_status(JNIEnv *env, MSG_error_t status) {
+void jmsg_throw_status(JNIEnv *env, msg_error_t status) {
   switch (status) {
     case MSG_TIMEOUT:
         jxbt_throw_time_out_failure(env,NULL);
@@ -129,7 +129,7 @@ Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
 JNIEXPORT void JNICALL
     JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls)
 {
-  MSG_error_t rv;
+  msg_error_t rv;
   int index;
   xbt_dynar_t hosts;
   jobject jhost;
@@ -148,7 +148,7 @@ JNIEXPORT void JNICALL
   /* Cleanup java hosts */
   hosts = MSG_hosts_as_dynar();
   for (index = 0; index < xbt_dynar_length(hosts) - 1; index++) {
-    jhost = (jobject) MSG_host_get_data(xbt_dynar_get_as(hosts,index,m_host_t));
+    jhost = (jobject) MSG_host_get_data(xbt_dynar_get_as(hosts,index,msg_host_t));
     if (jhost)
       jhost_unref(env, jhost);
 
@@ -160,7 +160,7 @@ JNIEXPORT void JNICALL
     JNICALL Java_org_simgrid_msg_Msg_clean(JNIEnv * env, jclass cls)
 {
   /* cleanup native stuff. Calling it is ... useless since leaking memory at the end of the simulation is a non-issue */
-  MSG_error_t rv = MSG_OK != MSG_clean();
+  msg_error_t rv = MSG_OK != MSG_clean();
   jxbt_check_res("MSG_clean()", rv, MSG_OK,
                  bprintf
                  ("unexpected error : MSG_clean() failed .. please report this bug "));
@@ -237,7 +237,7 @@ static int create_jprocess(int argc, char *argv[]) {
   xbt_assert((jprocess != NULL), "Process allocation failed.");
   jprocess = (*env)->NewGlobalRef(env, jprocess);
   //bind the process to the context
-  m_process_t process = MSG_process_self();
+  msg_process_t process = MSG_process_self();
   smx_ctx_java_t context = (smx_ctx_java_t)MSG_process_get_smx_ctx(process);
   context->jprocess = jprocess;
 /* sets the PID and the PPID of the process */

diff --git a/src/jmsg_comm.c b/src/jmsg_comm.c
index 87dc0ec..8fcd7ac 100644 (file)
--- a/src/jmsg_comm.c
+++ b/src/jmsg_comm.c
@@ -20,7 +20,7 @@ void jcomm_bind_task(JNIEnv *env, jobject jcomm) {
   jboolean jreceiving = (*env)->GetBooleanField(env, jcomm, jcomm_field_Comm_receiving);
   if (jreceiving == JNI_TRUE) {
     //bind the task object.
-    m_task_t task = MSG_comm_get_task(comm);
+    msg_task_t task = MSG_comm_get_task(comm);
     xbt_assert(task != NULL, "Task is NULL");
     jobject jtask_global = MSG_task_get_data(task);
     //case where the data has already been retrieved
@@ -59,9 +59,9 @@ Java_org_simgrid_msg_Comm_nativeInit(JNIEnv *env, jclass cls) {
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Comm_destroy(JNIEnv *env, jobject jcomm) {
   msg_comm_t comm;
-  m_task_t *task_received;
+  msg_task_t *task_received;
 
-  task_received = (m_task_t*)  (long) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_taskBind);
+  task_received = (msg_task_t*)  (long) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_taskBind);
   xbt_free(task_received);
 
   comm = (msg_comm_t) (long) (*env)->GetLongField(env, jcomm, jcomm_field_Comm_bind);
@@ -85,7 +85,7 @@ Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject jcomm) {
   xbt_ex_t e;
   TRY {
     if (MSG_comm_test(comm)) {
-      MSG_error_t status = MSG_comm_get_status(comm);
+      msg_error_t status = MSG_comm_get_status(comm);
       if (status == MSG_OK) {
         jcomm_bind_task(env,jcomm);
         return JNI_TRUE;
@@ -119,7 +119,7 @@ Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble tim
     return;
   }
 
-  MSG_error_t status;
+  msg_error_t status;
   xbt_ex_t e;
   TRY {
     status = MSG_comm_wait(comm,(double)timeout);

diff --git a/src/jmsg_host.c b/src/jmsg_host.c
index 5baed08..a48364d 100644 (file)
--- a/src/jmsg_host.c
+++ b/src/jmsg_host.c
@@ -31,16 +31,16 @@ void jhost_unref(JNIEnv * env, jobject jhost) {
   (*env)->DeleteGlobalRef(env, jhost);
 }
 
-void jhost_bind(jobject jhost, m_host_t host, JNIEnv * env) {
+void jhost_bind(jobject jhost, msg_host_t host, JNIEnv * env) {
   (*env)->SetLongField(env, jhost, jhost_field_Host_bind, (jlong) (long) (host));
 }
 
-m_host_t jhost_get_native(JNIEnv * env, jobject jhost) {
-  return (m_host_t) (long) (*env)->GetLongField(env, jhost, jhost_field_Host_bind);
+msg_host_t jhost_get_native(JNIEnv * env, jobject jhost) {
+  return (msg_host_t) (long) (*env)->GetLongField(env, jhost, jhost_field_Host_bind);
 }
 
 const char *jhost_get_name(jobject jhost, JNIEnv * env) {
-  m_host_t host = jhost_get_native(env, jhost);
+  msg_host_t host = jhost_get_native(env, jhost);
   return MSG_host_get_name(host);
 }
 
@@ -65,7 +65,7 @@ Java_org_simgrid_msg_Host_nativeInit(JNIEnv *env, jclass cls) {
 JNIEXPORT jobject JNICALL
 Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls,
                                          jstring jname) {
-  m_host_t host;                /* native host                                          */
+  msg_host_t host;                /* native host                                          */
   jobject jhost;                /* global reference to the java host instance returned  */
 
   /* get the C string from the java string */
@@ -120,7 +120,7 @@ JNIEXPORT jobject JNICALL
 Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jclass cls) {
   jobject jhost;
 
-  m_host_t host = MSG_host_self();
+  msg_host_t host = MSG_host_self();
 
   if (!MSG_host_get_data(host)) {
     /* the native host not yet associated with the java host instance */
@@ -164,7 +164,7 @@ Java_org_simgrid_msg_Host_getCount(JNIEnv * env, jclass cls) {
 JNIEXPORT jdouble JNICALL
 Java_org_simgrid_msg_Host_getSpeed(JNIEnv * env,
                                         jobject jhost) {
-  m_host_t host = jhost_get_native(env, jhost);
+  msg_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
     jxbt_throw_notbound(env, "host", jhost);
@@ -175,7 +175,7 @@ Java_org_simgrid_msg_Host_getSpeed(JNIEnv * env,
 }
 JNIEXPORT jint JNICALL
 Java_org_simgrid_msg_Host_getLoad(JNIEnv * env, jobject jhost) {
-  m_host_t host = jhost_get_native(env, jhost);
+  msg_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
     jxbt_throw_notbound(env, "host", jhost);
@@ -186,7 +186,7 @@ Java_org_simgrid_msg_Host_getLoad(JNIEnv * env, jobject jhost) {
 }
 JNIEXPORT jboolean JNICALL
 Java_org_simgrid_msg_Host_isAvail(JNIEnv * env, jobject jhost) {
-  m_host_t host = jhost_get_native(env, jhost);
+  msg_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
     jxbt_throw_notbound(env, "host", jhost);
@@ -203,7 +203,7 @@ Java_org_simgrid_msg_Host_all(JNIEnv * env, jclass cls_arg)
   jobjectArray jtable;
   jobject jhost;
   jstring jname;
-  m_host_t host;
+  msg_host_t host;
 
   xbt_dynar_t table =  MSG_hosts_as_dynar();
   int count = xbt_dynar_length(table);
@@ -222,7 +222,7 @@ Java_org_simgrid_msg_Host_all(JNIEnv * env, jclass cls_arg)
   }
 
   for (index = 0; index < count; index++) {
-    host = xbt_dynar_get_as(table,index,m_host_t);
+    host = xbt_dynar_get_as(table,index,msg_host_t);
     jhost = (jobject) (MSG_host_get_data(host));
 
     if (!jhost) {

diff --git a/src/jmsg_host.h b/src/jmsg_host.h
index 0aab697..8a236a4 100644 (file)
--- a/src/jmsg_host.h
+++ b/src/jmsg_host.h
@@ -57,7 +57,7 @@ void jhost_unref(JNIEnv * env, jobject jhost);
  *                                             this class is not found the function throws the exception 
  *                                             NotSuchFieldException.  
  */
-void jhost_bind(jobject jhost, m_host_t host, JNIEnv * env);
+void jhost_bind(jobject jhost, msg_host_t host, JNIEnv * env);
 
 /**
  * This function returns a native host from a java host instance.
@@ -73,7 +73,7 @@ void jhost_bind(jobject jhost, m_host_t host, JNIEnv * env);
  *                                             this class is not found the function throws the exception 
  *                                             NotSuchFieldException.  
  */
-m_host_t jhost_get_native(JNIEnv * env, jobject jhost);
+msg_host_t jhost_get_native(JNIEnv * env, jobject jhost);
 
 /**
  * This function returns the name of a MSG host.

diff --git a/src/jmsg_process.c b/src/jmsg_process.c
index 8150939..f05d8be 100644 (file)
--- a/src/jmsg_process.c
+++ b/src/jmsg_process.c
@@ -18,13 +18,13 @@ 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);
+    msg_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)
+jobject native_to_java_process(msg_process_t process)
 {
   return ((smx_ctx_java_t)MSG_process_get_smx_ctx(process))->jprocess;
 }
@@ -41,17 +41,17 @@ void jprocess_delete_global_ref(jobject jprocess, JNIEnv * env)
 
 void jprocess_join(jobject jprocess, JNIEnv * env)
 {
-       m_process_t process = jprocess_to_native_process(jprocess,env);
+       msg_process_t process = jprocess_to_native_process(jprocess,env);
        smx_ctx_java_t context = (smx_ctx_java_t)MSG_process_get_smx_ctx(process);
        xbt_os_thread_join(context->thread,NULL);
 }
 
-m_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env)
+msg_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env)
 {
-  return (m_process_t) (long) (*env)->GetLongField(env, jprocess, jprocess_field_Process_bind);
+  return (msg_process_t) (long) (*env)->GetLongField(env, jprocess, jprocess_field_Process_bind);
 }
 
-void jprocess_bind(jobject jprocess, m_process_t process, JNIEnv * env)
+void jprocess_bind(jobject jprocess, msg_process_t process, JNIEnv * env)
 {
   (*env)->SetLongField(env, jprocess, jprocess_field_Process_bind, (jlong)(process));
 }
@@ -104,8 +104,8 @@ Java_org_simgrid_msg_Process_create(JNIEnv * env,
   jstring jname;                /* the name of the java process instance                */
   const char *name;             /* the C name of the process                            */
   const char *hostname;
-  m_process_t process;          /* the native process to create                         */
-  m_host_t host;                /* Where that process lives */
+  msg_process_t process;          /* the native process to create                         */
+  msg_host_t host;                /* Where that process lives */
 
   hostname = (*env)->GetStringUTFChars(env, jhostname, 0);
 
@@ -174,7 +174,7 @@ JNIEXPORT jobject JNICALL
 Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jclass cls,
                                      jint PID)
 {
-  m_process_t process = MSG_process_from_PID(PID);
+  msg_process_t process = MSG_process_from_PID(PID);
 
   if (!process) {
     jxbt_throw_process_not_found(env, bprintf("PID = %d",(int) PID));
@@ -194,7 +194,7 @@ Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jclass cls,
 JNIEXPORT jobject JNICALL
 Java_org_simgrid_msg_Process_currentProcess(JNIEnv * env, jclass cls)
 {
-  m_process_t process = MSG_process_self();
+  msg_process_t process = MSG_process_self();
   jobject jprocess;
 
   if (!process) {
@@ -214,7 +214,7 @@ JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_suspend(JNIEnv * env,
                                    jobject jprocess)
 {
-  m_process_t process = jprocess_to_native_process(jprocess, env);
+  msg_process_t process = jprocess_to_native_process(jprocess, env);
 
   if (!process) {
     jxbt_throw_notbound(env, "process", jprocess);
@@ -222,7 +222,7 @@ Java_org_simgrid_msg_Process_suspend(JNIEnv * env,
   }
 
   /* try to suspend the process */
-  MSG_error_t rv = MSG_process_suspend(process);
+  msg_error_t rv = MSG_process_suspend(process);
 
   jxbt_check_res("MSG_process_suspend()", rv, MSG_OK,
                  bprintf("unexpected error , please report this bug"));
@@ -232,7 +232,7 @@ JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_resume(JNIEnv * env,
                                      jobject jprocess)
 {
-  m_process_t process = jprocess_to_native_process(jprocess, env);
+  msg_process_t process = jprocess_to_native_process(jprocess, env);
 
   if (!process) {
     jxbt_throw_notbound(env, "process", jprocess);
@@ -240,7 +240,7 @@ Java_org_simgrid_msg_Process_resume(JNIEnv * env,
   }
 
   /* try to resume the process */
-  MSG_error_t rv = MSG_process_resume(process);
+  msg_error_t rv = MSG_process_resume(process);
 
   jxbt_check_res("MSG_process_resume()", rv, MSG_OK,
                  bprintf("unexpected error , please report this bug"));
@@ -249,7 +249,7 @@ JNIEXPORT jboolean JNICALL
 Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env,
                                          jobject jprocess)
 {
-  m_process_t process = jprocess_to_native_process(jprocess, env);
+  msg_process_t process = jprocess_to_native_process(jprocess, env);
 
   if (!process) {
     jxbt_throw_notbound(env, "process", jprocess);
@@ -264,7 +264,7 @@ 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;
+       msg_error_t rv;
        xbt_ex_t e;
        TRY {
                rv = MSG_process_sleep(time);
@@ -281,7 +281,7 @@ 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);
@@ -301,7 +301,7 @@ Java_org_simgrid_msg_Process_kill(JNIEnv * env,
                                   jobject jprocess)
 {
        /* get the native instances from the java ones */
-  m_process_t process = jprocess_to_native_process(jprocess, env);
+  msg_process_t process = jprocess_to_native_process(jprocess, env);
   if (!process) {
     jxbt_throw_notbound(env, "process", jprocess);
     return;
@@ -313,14 +313,14 @@ JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_migrate(JNIEnv * env,
                                      jobject jprocess, jobject jhost)
 {
-  m_process_t process = jprocess_to_native_process(jprocess, env);
+  msg_process_t process = jprocess_to_native_process(jprocess, env);
 
   if (!process) {
     jxbt_throw_notbound(env, "process", jprocess);
     return;
   }
 
-  m_host_t host = jhost_get_native(env, jhost);
+  msg_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
     jxbt_throw_notbound(env, "host", jhost);
@@ -328,7 +328,7 @@ 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);
+  msg_error_t rv = MSG_process_migrate(process, host);
   if (rv != MSG_OK) {
     jmsg_throw_status(env,rv);
   }
@@ -337,6 +337,6 @@ Java_org_simgrid_msg_Process_migrate(JNIEnv * env,
 }
 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_t process = jprocess_to_native_process(jprocess, env);
        MSG_process_set_kill_time(process, (double)jkilltime);
 }

diff --git a/src/jmsg_process.h b/src/jmsg_process.h
index 7d5bead..d4351e5 100644 (file)
--- a/src/jmsg_process.h
+++ b/src/jmsg_process.h
@@ -26,7 +26,7 @@ JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_exit(JNIEnv *env, jobject);
 
 
-jobject native_to_java_process(m_process_t process);
+jobject native_to_java_process(msg_process_t process);
 
 /**
  * This function returns a global reference to the  java process instance 
@@ -78,7 +78,7 @@ void jprocess_join(jobject jprocess, JNIEnv * env);
  *                                             this class is not found the function throws the exception 
  *                                             NotSuchFieldException.  
  */
-void jprocess_bind(jobject jprocess, m_process_t process, JNIEnv * env);
+void jprocess_bind(jobject jprocess, msg_process_t process, JNIEnv * env);
 
 /**
  * This function returns a native process from a java process instance.
@@ -94,7 +94,7 @@ void jprocess_bind(jobject jprocess, m_process_t process, JNIEnv * env);
  *                                             this class is not found the function throws the exception 
  *                                             NotSuchFieldException.  
  */
-m_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env);
+msg_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env);
 
 /**
  * This function gets the id of the specified java process.

diff --git a/src/jmsg_task.c b/src/jmsg_task.c
index 00a065d..67a87de 100644 (file)
--- a/src/jmsg_task.c
+++ b/src/jmsg_task.c
@@ -27,14 +27,14 @@ static jfieldID jtask_field_Comm_bind;
 static jfieldID jtask_field_Comm_taskBind;
 static jfieldID jtask_field_Comm_receiving;
 
-void jtask_bind(jobject jtask, m_task_t task, JNIEnv * env)
+void jtask_bind(jobject jtask, msg_task_t task, JNIEnv * env)
 {
   (*env)->SetLongField(env, jtask, jtask_field_Task_bind, (jlong) (long) (task));
 }
 
-m_task_t jtask_to_native_task(jobject jtask, JNIEnv * env)
+msg_task_t jtask_to_native_task(jobject jtask, JNIEnv * env)
 {
-  return (m_task_t) (long) (*env)->GetLongField(env, jtask, jtask_field_Task_bind);
+  return (msg_task_t) (long) (*env)->GetLongField(env, jtask, jtask_field_Task_bind);
 }
 
 jboolean jtask_is_valid(jobject jtask, JNIEnv * env)
@@ -65,7 +65,7 @@ Java_org_simgrid_msg_Task_create(JNIEnv * env,
                                       jdouble jcomputeDuration,
                                       jdouble jmessageSize)
 {
-  m_task_t task;                /* the native task to create                            */
+  msg_task_t task;                /* the native task to create                            */
   const char *name = NULL;      /* the name of the task                                 */
 
   if (jcomputeDuration < 0) {
@@ -111,10 +111,10 @@ Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env,
                                          jdoubleArray
                                          jmessageSizes_arg) {
 
-  m_task_t task;                /* the native parallel task to create           */
+  msg_task_t task;                /* the native parallel task to create           */
   const char *name;             /* the name of the task                         */
   int host_count;
-  m_host_t *hosts;
+  msg_host_t *hosts;
   double *computeDurations;
   double *messageSizes;
   jdouble *jcomputeDurations;
@@ -145,7 +145,7 @@ Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env,
   host_count = (int) (*env)->GetArrayLength(env, jhosts);
 
 
-  hosts = xbt_new0(m_host_t, host_count);
+  hosts = xbt_new0(msg_host_t, host_count);
   computeDurations = xbt_new0(double, host_count);
   messageSizes = xbt_new0(double, host_count * host_count);
 
@@ -192,14 +192,14 @@ JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Task_cancel(JNIEnv * env,
                                       jobject jtask)
 {
-  m_task_t ptask = jtask_to_native_task(jtask, env);
+  msg_task_t ptask = jtask_to_native_task(jtask, env);
 
   if (!ptask) {
     jxbt_throw_notbound(env, "task", jtask);
     return;
   }
 
-  MSG_error_t rv = MSG_task_cancel(ptask);
+  msg_error_t rv = MSG_task_cancel(ptask);
 
   jxbt_check_res("MSG_task_cancel()", rv, MSG_OK,
                  bprintf("unexpected error , please report this bug"));
@@ -209,14 +209,14 @@ JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Task_execute(JNIEnv * env,
                                        jobject jtask)
 {
-  m_task_t task = jtask_to_native_task(jtask, env);
+  msg_task_t task = jtask_to_native_task(jtask, env);
 
   if (!task) {
     jxbt_throw_notbound(env, "task", jtask);
     return;
   }
   xbt_ex_t e;
-  MSG_error_t rv;
+  msg_error_t rv;
   TRY {
      rv = MSG_task_execute(task);
   }
@@ -232,7 +232,7 @@ Java_org_simgrid_msg_Task_execute(JNIEnv * env,
 JNIEXPORT jstring JNICALL
 Java_org_simgrid_msg_Task_getName(JNIEnv * env,
                                        jobject jtask) {
-  m_task_t task = jtask_to_native_task(jtask, env);
+  msg_task_t task = jtask_to_native_task(jtask, env);
 
   if (!task) {
     jxbt_throw_notbound(env, "task", jtask);
@@ -245,9 +245,9 @@ Java_org_simgrid_msg_Task_getName(JNIEnv * env,
 JNIEXPORT jobject JNICALL
 Java_org_simgrid_msg_Task_getSender(JNIEnv * env,
                                          jobject jtask) {
-  m_process_t process;
+  msg_process_t process;
 
-  m_task_t task = jtask_to_native_task(jtask, env);
+  msg_task_t task = jtask_to_native_task(jtask, env);
 
   if (!task) {
     jxbt_throw_notbound(env, "task", jtask);
@@ -265,8 +265,8 @@ JNIEXPORT jobject JNICALL
 Java_org_simgrid_msg_Task_getSource(JNIEnv * env,
                                          jobject jtask)
 {
-  m_host_t host;
-  m_task_t task = jtask_to_native_task(jtask, env);
+  msg_host_t host;
+  msg_task_t task = jtask_to_native_task(jtask, env);
 
   if (!task) {
     jxbt_throw_notbound(env, "task", jtask);
@@ -289,7 +289,7 @@ JNIEXPORT jdouble JNICALL
 Java_org_simgrid_msg_Task_getComputeDuration(JNIEnv * env,
                                                   jobject jtask)
 {
-  m_task_t ptask = jtask_to_native_task(jtask, env);
+  msg_task_t ptask = jtask_to_native_task(jtask, env);
 
   if (!ptask) {
     jxbt_throw_notbound(env, "task", jtask);
@@ -301,7 +301,7 @@ Java_org_simgrid_msg_Task_getComputeDuration(JNIEnv * env,
 JNIEXPORT jdouble JNICALL
 Java_org_simgrid_msg_Task_getRemainingDuration(JNIEnv * env, jobject jtask)
 {
-  m_task_t ptask = jtask_to_native_task(jtask, env);
+  msg_task_t ptask = jtask_to_native_task(jtask, env);
 
   if (!ptask) {
     jxbt_throw_notbound(env, "task", jtask);
@@ -311,7 +311,7 @@ Java_org_simgrid_msg_Task_getRemainingDuration(JNIEnv * env, jobject jtask)
 }
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Task_setName(JNIEnv *env, jobject jtask, jobject jname) {
-       m_task_t task = jtask_to_native_task(jtask, env);
+       msg_task_t task = jtask_to_native_task(jtask, env);
 
        if (!task) {
                jxbt_throw_notbound(env, "task", jtask);
@@ -328,7 +328,7 @@ JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Task_setPriority(JNIEnv * env,
                                            jobject jtask, jdouble priority)
 {
-  m_task_t task = jtask_to_native_task(jtask, env);
+  msg_task_t task = jtask_to_native_task(jtask, env);
 
   if (!task) {
     jxbt_throw_notbound(env, "task", jtask);
@@ -339,7 +339,7 @@ Java_org_simgrid_msg_Task_setPriority(JNIEnv * env,
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Task_setComputeDuration
                (JNIEnv *env, jobject jtask, jdouble computationAmount) {
-       m_task_t task = jtask_to_native_task(jtask, env);
+       msg_task_t task = jtask_to_native_task(jtask, env);
 
        if (!task) {
     jxbt_throw_notbound(env, "task", jtask);
@@ -352,10 +352,10 @@ Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask,
                                     jstring jalias,
                                     jdouble jtimeout)
 {
-  MSG_error_t rv;
+  msg_error_t rv;
   const char *alias = (*env)->GetStringUTFChars(env, jalias, 0);
 
-  m_task_t task = jtask_to_native_task(jtask, env);
+  msg_task_t task = jtask_to_native_task(jtask, env);
 
 
   if (!task) {
@@ -385,8 +385,8 @@ Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env, jobject jtask,
                                            jstring jalias,
                                            jdouble jmaxRate)
 {
-  m_task_t task = jtask_to_native_task(jtask, env);
-  MSG_error_t rv;
+  msg_task_t task = jtask_to_native_task(jtask, env);
+  msg_error_t rv;
   const char *alias;
 
   if (!task) {
@@ -419,11 +419,11 @@ Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass cls,
                                        jstring jalias, jdouble jtimeout,
                                        jobject jhost)
 {
-  MSG_error_t rv;
-  m_task_t *task = xbt_new(m_task_t,1);
+  msg_error_t rv;
+  msg_task_t *task = xbt_new(msg_task_t,1);
   *task = NULL;
 
-  m_host_t host = NULL;
+  msg_host_t host = NULL;
   jobject jtask_global, jtask_local;
   const char *alias;
 
@@ -470,7 +470,7 @@ Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass cls, jstring jmailbox) {
        const char *mailbox;
        jclass comm_class;
        //pointer to store the task object pointer.
-       m_task_t *task = xbt_new(m_task_t,1);
+       msg_task_t *task = xbt_new(msg_task_t,1);
        *task = NULL;
        /* There should be a cache here */
        comm_class = (*env)->FindClass(env, "org/simgrid/msg/Comm");
@@ -505,7 +505,7 @@ Java_org_simgrid_msg_Task_isend(JNIEnv *env, jobject jtask, jstring jmailbox) {
 
   const char *mailbox;
 
-  m_task_t task;
+  msg_task_t task;
 
   jobject jcomm;
   msg_comm_t comm;
@@ -539,7 +539,7 @@ MSG_task_set_data(task, (void *) (*env)->NewGlobalRef(env, jtask));
 }
 
 static void msg_task_cancel_on_failed_dsend(void*t) {
-  m_task_t task = t;
+  msg_task_t task = t;
   JNIEnv *env =get_current_thread_env();
   jobject jtask_global = MSG_task_get_data(task);
 
@@ -554,7 +554,7 @@ Java_org_simgrid_msg_Task_dsend(JNIEnv * env, jobject jtask,
                                 jstring jalias) {
   const char *alias = (*env)->GetStringUTFChars(env, jalias, 0);
 
-  m_task_t task = jtask_to_native_task(jtask, env);
+  msg_task_t task = jtask_to_native_task(jtask, env);
 
 
   if (!task) {
@@ -598,7 +598,7 @@ Java_org_simgrid_msg_Task_listenFromHost(JNIEnv * env, jclass cls,
   int rv;
   const char *alias;
 
-  m_host_t host = jhost_get_native(env, jhost);
+  msg_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
     jxbt_throw_notbound(env, "host", jhost);

diff --git a/src/jmsg_task.h b/src/jmsg_task.h
index 5cb15e8..56a96fb 100644 (file)
--- a/src/jmsg_task.h
+++ b/src/jmsg_task.h
@@ -44,7 +44,7 @@ void jtask_delete_global_ref(jobject jtask, JNIEnv * env);
  *                                             this class is not found the function throws the exception 
  *                                             NotSuchFieldException.  
  */
-void jtask_bind(jobject jtask, m_task_t task, JNIEnv * env);
+void jtask_bind(jobject jtask, msg_task_t task, JNIEnv * env);
 
 /**
  * This function returns a native task from a java task instance.
@@ -60,7 +60,7 @@ void jtask_bind(jobject jtask, m_task_t task, JNIEnv * env);
  *                                             this class is not found the function throws the exception 
  *                                             NotSuchFieldException.  
  */
-m_task_t jtask_to_native_task(jobject jtask, JNIEnv * env);
+msg_task_t jtask_to_native_task(jobject jtask, JNIEnv * env);
 
 /**
  * This function tests if a java task instance is valid.

diff --git a/src/jmsg_vm.c b/src/jmsg_vm.c
index ded41c8..0923f63 100644 (file)
--- a/src/jmsg_vm.c
+++ b/src/jmsg_vm.c
@@ -29,7 +29,7 @@ Java_org_simgrid_msg_VM_nativeInit(JNIEnv *env, jclass cls) {
 }
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_VM_start(JNIEnv *env, jobject jvm, jobject jhost, jint jcoreamount) {
-  m_host_t host = jhost_get_native(env, jhost);
+  msg_host_t host = jhost_get_native(env, jhost);
 
   msg_vm_t vm = MSG_vm_start(host, (int)jcoreamount);
 
@@ -55,7 +55,7 @@ Java_org_simgrid_msg_VM_isRunning(JNIEnv *env, jobject jvm) {
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_VM_bind(JNIEnv *env, jobject jvm, jobject jprocess) {
   msg_vm_t vm = jvm_get_native(env,jvm);
-  m_process_t process = jprocess_to_native_process(jprocess,env);
+  msg_process_t process = jprocess_to_native_process(jprocess,env);
 
   xbt_assert((vm != NULL), "VM object is not binded");
   xbt_assert((process != NULL), "Process object is not binded.");
@@ -65,14 +65,14 @@ Java_org_simgrid_msg_VM_bind(JNIEnv *env, jobject jvm, jobject jprocess) {
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_VM_unbind(JNIEnv *env, jobject jvm, jobject jprocess) {
   msg_vm_t vm = jvm_get_native(env,jvm);
-  m_process_t process = jprocess_to_native_process(jprocess,env);
+  msg_process_t process = jprocess_to_native_process(jprocess,env);
 
   MSG_vm_unbind(vm,process);
 }
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_VM_migrate(JNIEnv *env, jobject jvm, jobject jhost) {
   msg_vm_t vm = jvm_get_native(env,jvm);
-  m_host_t host = jhost_get_native(env, jhost);
+  msg_host_t host = jhost_get_native(env, jhost);
 
   MSG_vm_migrate(vm,host);
 }