Cosmetics: a switch..case is clearer here.

[simgrid.git] / src / simix / smx_smurf.c

diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c
index 8629749..ddbbbd3 100644 (file)
--- a/src/simix/smx_smurf.c
+++ b/src/simix/smx_smurf.c
@@ -7,7 +7,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_smurf, simix,
 
 XBT_INLINE smx_simcall_t SIMIX_simcall_mine()
 {
-  smx_process_t issuer = SIMIX_process_self();
+  volatile smx_process_t issuer = SIMIX_process_self();
   return &issuer->simcall;
 }
 
@@ -20,7 +20,7 @@ void SIMIX_simcall_push(smx_process_t self)
 {
   if (self != simix_global->maestro_process) {
     XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name,
-        SIMIX_simcall_name(self->simcall.call), self->simcall.call);
+              SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);
     SIMIX_process_yield(self);
   } else {
     SIMIX_simcall_pre(&self->simcall, 0);
@@ -30,10 +30,13 @@ void SIMIX_simcall_push(smx_process_t self)
 void SIMIX_simcall_answer(smx_simcall_t simcall)
 {
   if (simcall->issuer != simix_global->maestro_process){
-    XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall->call), simcall->call,
+    XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall->call), (int)simcall->call,
         simcall->issuer->name, simcall->issuer);
     simcall->issuer->simcall.call = SIMCALL_NONE;
-    xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, simcall->issuer);
+    if(!xbt_dynar_member(simix_global->process_to_run, &(simcall->issuer)))
+      xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, simcall->issuer);
+    else
+      DIE_IMPOSSIBLE;
   }
 }
 
@@ -489,6 +492,18 @@ void SIMIX_simcall_pre(smx_simcall_t simcall, int value)
       SIMIX_pre_file_write(simcall);
       break;
 
+    case SIMCALL_FILE_OPEN:
+      SIMIX_pre_file_open(simcall);
+      break;
+
+    case SIMCALL_FILE_CLOSE:
+      SIMIX_pre_file_close(simcall);
+      break;
+
+    case SIMCALL_FILE_STAT:
+      SIMIX_pre_file_stat(simcall);
+      break;
+
     case SIMCALL_NONE:
       THROWF(arg_error,0,"Asked to do the noop syscall on %s@%s",
           SIMIX_process_get_name(simcall->issuer),