X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/79e23e4dabd1e730aa9cbd05a2172be5a0b53699..fc000fcf61f734006d253abb7cb336882e00b6b0:/src/jmsg.c

diff --git a/src/jmsg.c b/src/jmsg.c
index 5becc9e54d..d7a2ae85b0 100644
--- a/src/jmsg.c
+++ b/src/jmsg.c
@@ -50,7 +50,7 @@ static jobject native_to_java_process(m_process_t process)
  */
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
                                          jobject jprocess_arg,
                                          jobject jhost)
 {
@@ -62,7 +62,7 @@ Java_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
   m_process_t process;          /* the native process to create                         */
   m_host_t host;                /* Where that process lives */
    
-  DEBUG4("Java_simgrid_msg_MsgNative_processCreate(env=%p,cls=%p,jproc=%p,jhost=%p)",
+  XBT_DEBUG("Java_org_simgrid_msg_MsgNative_processCreate(env=%p,cls=%p,jproc=%p,jhost=%p)",
 	 env, cls, jprocess_arg, jhost);
    
    
@@ -104,17 +104,16 @@ Java_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
   MSG_process_set_data(process,&process);
    
   /* release our reference to the process name (variable name becomes invalid) */
-  (*env)->ReleaseStringUTFChars(env, jname, name);
+  //FIXME : This line should be uncommented but with mac it doesn't work. BIG WARNING
+  //(*env)->ReleaseStringUTFChars(env, jname, name);
    
-
-
   /* bind the java process instance to the native process */
   jprocess_bind(jprocess, process, env);
 
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processSuspend(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processSuspend(JNIEnv * env, jclass cls,
                                           jobject jprocess)
 {
   m_process_t process = jprocess_to_native_process(jprocess, env);
@@ -133,7 +132,7 @@ Java_simgrid_msg_MsgNative_processSuspend(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processResume(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processResume(JNIEnv * env, jclass cls,
                                          jobject jprocess)
 {
   m_process_t process = jprocess_to_native_process(jprocess, env);
@@ -151,7 +150,7 @@ Java_simgrid_msg_MsgNative_processResume(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jboolean JNICALL
-Java_simgrid_msg_MsgNative_processIsSuspended(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processIsSuspended(JNIEnv * env, jclass cls,
                                               jobject jprocess)
 {
   m_process_t process = jprocess_to_native_process(jprocess, env);
@@ -166,7 +165,7 @@ Java_simgrid_msg_MsgNative_processIsSuspended(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processKill(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processKill(JNIEnv * env, jclass cls,
                                        jobject jprocess)
 {
   /* get the native instances from the java ones */
@@ -187,7 +186,7 @@ Java_simgrid_msg_MsgNative_processKill(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_processGetHost(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processGetHost(JNIEnv * env, jclass cls,
                                           jobject jprocess)
 {
   /* get the native instances from the java ones */
@@ -212,7 +211,7 @@ Java_simgrid_msg_MsgNative_processGetHost(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_processFromPID(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processFromPID(JNIEnv * env, jclass cls,
                                           jint PID)
 {
   m_process_t process = MSG_process_from_PID(PID);
@@ -232,7 +231,7 @@ Java_simgrid_msg_MsgNative_processFromPID(JNIEnv * env, jclass cls,
 
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_processGetPID(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processGetPID(JNIEnv * env, jclass cls,
                                          jobject jprocess)
 {
   m_process_t process = jprocess_to_native_process(jprocess, env);
@@ -247,7 +246,7 @@ Java_simgrid_msg_MsgNative_processGetPID(JNIEnv * env, jclass cls,
 
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_processGetPPID(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processGetPPID(JNIEnv * env, jclass cls,
                                           jobject jprocess)
 {
   m_process_t process = jprocess_to_native_process(jprocess, env);
@@ -261,7 +260,7 @@ Java_simgrid_msg_MsgNative_processGetPPID(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_processSelf(JNIEnv * env, jclass cls)
+Java_org_simgrid_msg_MsgNative_processSelf(JNIEnv * env, jclass cls)
 {
   m_process_t process = MSG_process_self();
   jobject jprocess;
@@ -280,9 +279,16 @@ Java_simgrid_msg_MsgNative_processSelf(JNIEnv * env, jclass cls)
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processChangeHost(JNIEnv * env, jclass cls,
-                                             jobject jhost)
+Java_org_simgrid_msg_MsgNative_processMigrate(JNIEnv * env, jclass cls,
+                                             jobject jprocess, jobject jhost)
 {
+  m_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);
 
   if (!host) {
@@ -291,15 +297,14 @@ Java_simgrid_msg_MsgNative_processChangeHost(JNIEnv * env, jclass cls,
   }
 
   /* try to change the host of the process */
-  MSG_error_t rv = MSG_process_change_host(host);
-
-  jxbt_check_res("MSG_process_change_host()", rv, MSG_OK,
+  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"));
 
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processWaitFor(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processWaitFor(JNIEnv * env, jclass cls,
                                           jdouble seconds)
 {
   MSG_error_t rv = MSG_process_sleep((double) seconds);
@@ -316,7 +321,7 @@ Java_simgrid_msg_MsgNative_processWaitFor(JNIEnv * env, jclass cls,
  ***************************************************************************************/
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_hostGetByName(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostGetByName(JNIEnv * env, jclass cls,
                                          jstring jname)
 {
   m_host_t host;                /* native host                                          */
@@ -324,10 +329,10 @@ Java_simgrid_msg_MsgNative_hostGetByName(JNIEnv * env, jclass cls,
 
   /* get the C string from the java string */
   const char *name = (*env)->GetStringUTFChars(env, jname, 0);
-  DEBUG1("Looking for host '%s'",name);
+  XBT_DEBUG("Looking for host '%s'",name);
   /* get the host by name       (the hosts are created during the grid resolution) */
   host = MSG_get_host_by_name(name);
-  DEBUG2("MSG gave %p as native host (simdata=%p)", host,host? host->simdata:NULL);
+  XBT_DEBUG("MSG gave %p as native host (simdata=%p)", host,host? host->simdata:NULL);
 
   if (!host) {                  /* invalid name */
     jxbt_throw_host_not_found(env, name);
@@ -368,7 +373,7 @@ Java_simgrid_msg_MsgNative_hostGetByName(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jstring JNICALL
-Java_simgrid_msg_MsgNative_hostGetName(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostGetName(JNIEnv * env, jclass cls,
                                        jobject jhost)
 {
   m_host_t host = jhost_get_native(env, jhost);
@@ -382,13 +387,13 @@ Java_simgrid_msg_MsgNative_hostGetName(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_hostGetNumber(JNIEnv * env, jclass cls)
+Java_org_simgrid_msg_MsgNative_hostGetNumber(JNIEnv * env, jclass cls)
 {
   return (jint) MSG_get_host_number();
 }
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_hostSelf(JNIEnv * env, jclass cls)
+Java_org_simgrid_msg_MsgNative_hostSelf(JNIEnv * env, jclass cls)
 {
   jobject jhost;
 
@@ -424,7 +429,7 @@ Java_simgrid_msg_MsgNative_hostSelf(JNIEnv * env, jclass cls)
 }
 
 JNIEXPORT jdouble JNICALL
-Java_simgrid_msg_MsgNative_hostGetSpeed(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostGetSpeed(JNIEnv * env, jclass cls,
                                         jobject jhost)
 {
   m_host_t host = jhost_get_native(env, jhost);
@@ -438,7 +443,7 @@ Java_simgrid_msg_MsgNative_hostGetSpeed(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_hostGetLoad(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostGetLoad(JNIEnv * env, jclass cls,
                                        jobject jhost)
 {
   m_host_t host = jhost_get_native(env, jhost);
@@ -453,7 +458,7 @@ Java_simgrid_msg_MsgNative_hostGetLoad(JNIEnv * env, jclass cls,
 
 
 JNIEXPORT jboolean JNICALL
-Java_simgrid_msg_MsgNative_hostIsAvail(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostIsAvail(JNIEnv * env, jclass cls,
                                        jobject jhost)
 {
   m_host_t host = jhost_get_native(env, jhost);
@@ -472,7 +477,7 @@ Java_simgrid_msg_MsgNative_hostIsAvail(JNIEnv * env, jclass cls,
  ***************************************************************************************/
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskCreate(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskCreate(JNIEnv * env, jclass cls,
                                       jobject jtask, jstring jname,
                                       jdouble jcomputeDuration,
                                       jdouble jmessageSize)
@@ -515,7 +520,7 @@ Java_simgrid_msg_MsgNative_taskCreate(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv * env, jclass cls,
                                                jobject jtask,
                                                jstring jname,
                                                jobjectArray jhosts,
@@ -603,7 +608,7 @@ Java_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_taskGetSender(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskGetSender(JNIEnv * env, jclass cls,
                                          jobject jtask)
 {
   m_process_t process;
@@ -620,7 +625,7 @@ Java_simgrid_msg_MsgNative_taskGetSender(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_taskGetSource(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskGetSource(JNIEnv * env, jclass cls,
                                          jobject jtask)
 {
   m_host_t host;
@@ -643,7 +648,7 @@ Java_simgrid_msg_MsgNative_taskGetSource(JNIEnv * env, jclass cls,
 
 
 JNIEXPORT jstring JNICALL
-Java_simgrid_msg_MsgNative_taskGetName(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskGetName(JNIEnv * env, jclass cls,
                                        jobject jtask)
 {
   m_task_t task = jtask_to_native_task(jtask, env);
@@ -657,7 +662,7 @@ Java_simgrid_msg_MsgNative_taskGetName(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskCancel(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskCancel(JNIEnv * env, jclass cls,
                                       jobject jtask)
 {
   m_task_t ptask = jtask_to_native_task(jtask, env);
@@ -674,7 +679,7 @@ Java_simgrid_msg_MsgNative_taskCancel(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jdouble JNICALL
-Java_simgrid_msg_MsgNative_taskGetComputeDuration(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskGetComputeDuration(JNIEnv * env, jclass cls,
                                                   jobject jtask)
 {
   m_task_t ptask = jtask_to_native_task(jtask, env);
@@ -687,7 +692,7 @@ Java_simgrid_msg_MsgNative_taskGetComputeDuration(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jdouble JNICALL
-Java_simgrid_msg_MsgNative_taskGetRemainingDuration(JNIEnv * env,
+Java_org_simgrid_msg_MsgNative_taskGetRemainingDuration(JNIEnv * env,
                                                     jclass cls,
                                                     jobject jtask)
 {
@@ -701,7 +706,7 @@ Java_simgrid_msg_MsgNative_taskGetRemainingDuration(JNIEnv * env,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskSetPriority(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskSetPriority(JNIEnv * env, jclass cls,
                                            jobject jtask, jdouble priority)
 {
   m_task_t task = jtask_to_native_task(jtask, env);
@@ -714,19 +719,17 @@ Java_simgrid_msg_MsgNative_taskSetPriority(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskDestroy(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskDestroy(JNIEnv * env, jclass cls,
                                        jobject jtask_arg)
 {
 
   /* get the native task */
   m_task_t task = jtask_to_native_task(jtask_arg, env);
-  jobject jtask;
 
   if (!task) {
     jxbt_throw_notbound(env, "task", task);
     return;
   }
-  jtask = (jobject) MSG_task_get_data(task);
 
   MSG_error_t rv = MSG_task_destroy(task);
 
@@ -735,7 +738,7 @@ Java_simgrid_msg_MsgNative_taskDestroy(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls,
                                        jobject jtask)
 {
   m_task_t task = jtask_to_native_task(jtask, env);
@@ -748,7 +751,7 @@ Java_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls,
   MSG_error_t rv = MSG_task_execute(task);
 
   jxbt_check_res("MSG_task_execute()", rv,
-                 MSG_HOST_FAILURE | MSG_TASK_CANCELLED,
+                 MSG_HOST_FAILURE | MSG_TASK_CANCELED,
                  bprintf("while executing task %s",
                          MSG_task_get_name(task)));
 }
@@ -759,20 +762,19 @@ Java_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls,
 
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_Msg_getErrCode(JNIEnv * env, jclass cls)
+Java_org_simgrid_msg_Msg_getErrCode(JNIEnv * env, jclass cls)
 {
   return (jint) MSG_get_errno();
 }
 
 JNIEXPORT jdouble JNICALL
-Java_simgrid_msg_Msg_getClock(JNIEnv * env, jclass cls)
+Java_org_simgrid_msg_Msg_getClock(JNIEnv * env, jclass cls)
 {
   return (jdouble) MSG_get_clock();
 }
 
-
 JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
+Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
 {
   char **argv = NULL;
   int index;
@@ -780,7 +782,7 @@ Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
   jstring jval;
   const char *tmp;
 
-  factory_initializer_to_use = SIMIX_ctx_java_factory_init;
+  smx_factory_initializer_to_use = SIMIX_ctx_java_factory_init;
 
   if (jargs)
     argc = (int) (*env)->GetArrayLength(env, jargs);
@@ -807,24 +809,24 @@ Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
 }
 
 JNIEXPORT void JNICALL
-    JNICALL Java_simgrid_msg_Msg_run(JNIEnv * env, jclass cls)
+    JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls)
 {
   MSG_error_t rv;
-  int index;                    //xbt_fifo_item_t item = NULL;
+  int index;
   m_host_t *hosts;
   jobject jhost;
 
   /* Run everything */
-  INFO0("Ready to run MSG_MAIN");
+  XBT_INFO("Ready to run MSG_MAIN");
   rv = MSG_main();
-  INFO0("Done running MSG_MAIN");
+  XBT_INFO("Done running MSG_MAIN");
   jxbt_check_res("MSG_main()", rv, MSG_OK,
                  bprintf
                  ("unexpected error : MSG_main() failed .. please report this bug "));
 
-  INFO0("MSG_main finished");
+  XBT_INFO("MSG_main finished");
 
-  INFO0("Clean java world");
+  XBT_INFO("Clean java world");
   /* Cleanup java hosts */
   hosts = MSG_get_host_table();
   for (index = 0; index < MSG_get_host_number() - 1; index++) {
@@ -834,24 +836,27 @@ JNIEXPORT void JNICALL
 
   }
 
-  INFO0("Clean native world");
-  /* cleanup native stuff */
-  rv = MSG_OK != MSG_clean();
+  XBT_INFO("Clean native world");
+}
+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();
   jxbt_check_res("MSG_clean()", rv, MSG_OK,
                  bprintf
                  ("unexpected error : MSG_clean() failed .. please report this bug "));
-
 }
-
+   
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_processKillAll(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processKillAll(JNIEnv * env, jclass cls,
                                           jint jresetPID)
 {
   return (jint) MSG_process_killall((int) jresetPID);
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls,
                                        jstring jplatformFile)
 {
 
@@ -864,7 +869,7 @@ Java_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processExit(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processExit(JNIEnv * env, jclass cls,
                                        jobject jprocess)
 {
 
@@ -875,19 +880,19 @@ Java_simgrid_msg_MsgNative_processExit(JNIEnv * env, jclass cls,
     return;
   }
 
-  MSG_process_kill(process);
+  smx_ctx_java_stop(MSG_process_get_smx_ctx(process));
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_info(JNIEnv * env, jclass cls, jstring js)
+Java_org_simgrid_msg_Msg_info(JNIEnv * env, jclass cls, jstring js)
 {
   const char *s = (*env)->GetStringUTFChars(env, js, 0);
-  INFO1("%s", s);
+  XBT_INFO("%s", s);
   (*env)->ReleaseStringUTFChars(env, js, s);
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg)
+Java_org_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg)
 {
   int index;
   jobjectArray jtable;
@@ -898,7 +903,7 @@ Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg)
   int count = MSG_get_host_number();
   m_host_t *table = MSG_get_host_table();
 
-  jclass cls = jxbt_get_class(env, "simgrid/msg/Host");
+  jclass cls = jxbt_get_class(env, "org/simgrid/msg/Host");
 
   if (!cls) {
     return NULL;
@@ -919,7 +924,7 @@ Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg)
       jname = (*env)->NewStringUTF(env, MSG_host_get_name(host));
 
       jhost =
-          Java_simgrid_msg_MsgNative_hostGetByName(env, cls_arg, jname);
+          Java_org_simgrid_msg_MsgNative_hostGetByName(env, cls_arg, jname);
       /* FIXME: leak of jname ? */
     }
 
@@ -930,7 +935,7 @@ Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg)
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskSend(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskSend(JNIEnv * env, jclass cls,
                                     jstring jalias, jobject jtask,
                                     jdouble jtimeout)
 {
@@ -960,7 +965,7 @@ Java_simgrid_msg_MsgNative_taskSend(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskSendBounded(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskSendBounded(JNIEnv * env, jclass cls,
                                            jstring jalias, jobject jtask,
                                            jdouble jmaxRate)
 {
@@ -990,7 +995,7 @@ Java_simgrid_msg_MsgNative_taskSendBounded(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls,
                                        jstring jalias, jdouble jtimeout,
                                        jobject jhost)
 {
@@ -1029,7 +1034,7 @@ Java_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jboolean JNICALL
-Java_simgrid_msg_MsgNative_taskListen(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskListen(JNIEnv * env, jclass cls,
                                       jstring jalias)
 {
 
@@ -1046,7 +1051,7 @@ Java_simgrid_msg_MsgNative_taskListen(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_taskListenFromHost(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskListenFromHost(JNIEnv * env, jclass cls,
                                               jstring jalias,
                                               jobject jhost)
 {
@@ -1069,7 +1074,7 @@ Java_simgrid_msg_MsgNative_taskListenFromHost(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_taskListenFrom(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskListenFrom(JNIEnv * env, jclass cls,
                                           jstring jalias)
 {
 
@@ -1084,14 +1089,14 @@ Java_simgrid_msg_MsgNative_taskListenFrom(JNIEnv * env, jclass cls,
 }
 
 JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
                                        jstring jdeploymentFile)
 {
 
   const char *deploymentFile =
       (*env)->GetStringUTFChars(env, jdeploymentFile, 0);
 
-  surf_parse_reset_parser();
+  surf_parse_reset_callbacks();
 
   surfxml_add_callback(STag_surfxml_process_cb_list,
                        japplication_handler_on_begin_process);