Let it compile without --disable-compile-optimizations

[simgrid.git] / src / java / jmsg.c

diff --git a/src/java/jmsg.c b/src/java/jmsg.c
index d0438cc..ce812ae 100644 (file)
--- a/src/java/jmsg.c
+++ b/src/java/jmsg.c
@@ -114,7 +114,6 @@ Java_simgrid_msg_Msg_processCreate(JNIEnv* env, jclass cls, jobject jprocess_arg
                        process->simdata->m_host->simdata->s_host, 
                        /*data*/ (void*)process,
                        jprocess_arg,env,
-                       __MSG_process_cleanup,
                        &process->simdata->s_process);
   DEBUG1("context created (s_process=%p)",process->simdata->s_process);
 
@@ -127,29 +126,9 @@ Java_simgrid_msg_Msg_processCreate(JNIEnv* env, jclass cls, jobject jprocess_arg
     
   process->simdata->last_errno = MSG_OK;
     
-
-#ifdef KILLME    
-  /* add the process in the list of the process of the host */
-  xbt_fifo_unshift(host->simdata->process_list, process);
-    
-  self = msg_global->current_process;
-    
-  process->simdata->context->env = env;
-    
-  /* start the java process */
-  xbt_context_start(process->simdata->context); 
-       
-  msg_global->current_process = self;
-#endif
-    
   /* add the process to the list of the processes of the simulation */
   xbt_fifo_unshift(msg_global->process_list, process);
        
-  /* add the process to the list of the processes to run in the simulation */
-  //  xbt_fifo_unshift(msg_global->process_to_run, process);
-    
-  //  PAJE_PROCESS_NEW(process);
-  //#endif
 }
 
 JNIEXPORT void JNICALL 
@@ -798,7 +777,7 @@ Java_simgrid_msg_Msg_taskDestroy(JNIEnv* env, jclass cls, jobject jtask_arg) {
   jobject jtask;
 
   if(!task){
-    jxbt_throw_notbound(env,"task",jtask);
+    jxbt_throw_notbound(env,"task",task);
     return;
   }
   jtask = (jobject)task->data;
@@ -1121,8 +1100,8 @@ Java_simgrid_msg_Msg_waitSignal(JNIEnv* env, jclass cls, jobject jprocess) {
   m_process_t m_process = jprocess_to_native_process(jprocess,env);
   smx_process_t s_process;
 
-  xbt_mutex_t ctx_mutex, creation_mutex;
-  xbt_thcond_t ctx_cond, creation_cond;
+  xbt_os_mutex_t ctx_mutex, creation_mutex;
+  xbt_os_cond_t ctx_cond, creation_cond;
 
   DEBUG3("Msg_waitSignal(m_process=%p %s/%s)",
         m_process,m_process->name,m_process->simdata->m_host->name);
@@ -1144,12 +1123,12 @@ Java_simgrid_msg_Msg_waitSignal(JNIEnv* env, jclass cls, jobject jprocess) {
   creation_mutex = xbt_creation_mutex_get();
   creation_cond = xbt_creation_cond_get();
 
-  xbt_mutex_lock(creation_mutex);
-  xbt_mutex_lock(ctx_mutex);
-  xbt_thcond_signal( creation_cond );
-  xbt_mutex_unlock( creation_mutex );
-  xbt_thcond_wait(ctx_cond, ctx_mutex);
-  xbt_mutex_unlock(ctx_mutex);
+  xbt_os_mutex_lock(creation_mutex);
+  xbt_os_mutex_lock(ctx_mutex);
+  xbt_os_cond_signal( creation_cond );
+  xbt_os_mutex_unlock( creation_mutex );
+  xbt_os_cond_wait(ctx_cond, ctx_mutex);
+  xbt_os_mutex_unlock(ctx_mutex);
 }
 
 JNIEXPORT void JNICALL