Remove the 'TUTORIAL: New API' chunks

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

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 3ff404a..b9dedde 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -71,7 +71,7 @@ static void _XBT_CALL segvhandler(int signum, siginfo_t *siginfo, void *context)
 #ifdef HAVE_SMPI
     if (smpi_enabled() && !smpi_privatize_global_variables) {
       fprintf(stderr,
-        "Try to enable SMPI variable privatization with --cfg:smpi/privatize_global_variable:yes.\n");
+        "Try to enable SMPI variable privatization with --cfg=smpi/privatize_global_variables:yes.\n");
     }
 #endif
   }
@@ -394,7 +394,7 @@ void SIMIX_run(void)
 
       xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
         if (process->simcall.call != SIMCALL_NONE) {
-          SIMIX_simcall_pre(&process->simcall, 0);
+          SIMIX_simcall_enter(&process->simcall, 0);
         }
       }
     }
@@ -420,13 +420,13 @@ void SIMIX_run(void)
     /* Wake up all processes waiting for a Surf action to finish */
     xbt_dynar_foreach(model_list, iter, model) {
       while ((action = surf_model_extract_failed_action_set(model)))
-        SIMIX_simcall_post((smx_action_t) surf_action_get_data(action));
+        SIMIX_simcall_exit((smx_action_t) surf_action_get_data(action));
 
       while ((action = surf_model_extract_done_action_set(model)))
         if (surf_action_get_data(action) == NULL)
           XBT_DEBUG("probably vcpu's action %p, skip", action);
         else
-          SIMIX_simcall_post((smx_action_t) surf_action_get_data(action));
+          SIMIX_simcall_exit((smx_action_t) surf_action_get_data(action));
     }
 
     /* Autorestart all process */
@@ -444,8 +444,6 @@ void SIMIX_run(void)
 
 
     XBT_DEBUG("### time %f, empty %d", time, xbt_dynar_is_empty(simix_global->process_to_run));
-    // !(time == -1.0 && xbt_dynar_is_empty())
-
 
   } while (time != -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run));
 
@@ -569,13 +567,6 @@ void SIMIX_display_process_status(void)
 
       case SIMIX_ACTION_IO:
         action_description = "I/O";
-        break;
-      /* **************************************/
-      /* TUTORIAL: New API                    */
-      case SIMIX_ACTION_NEW_API:
-        action_description = "NEW API";
-      /* **************************************/
-
         break;
       }
       XBT_INFO("Process %lu (%s@%s): waiting for %s action %p (%s) in state %d to finish",