rename SIMIX_simcall_{pre,post} to SIMIX_simcall_{enter,exit}

[simgrid.git] / src / simix / smx_smurf_private.h

diff --git a/src/simix/smx_smurf_private.h b/src/simix/smx_smurf_private.h
index b33c06c..bc10372 100644 (file)
--- a/src/simix/smx_smurf_private.h
+++ b/src/simix/smx_smurf_private.h
@@ -18,15 +18,7 @@ SG_BEGIN_DECL()
  *
  * */
 
-/**
- * \brief All possible simcalls.
- */
-typedef enum {
-SIMCALL_NONE,
-#include "simcalls_generated_enum.h"
-SIMCALL_NEW_API_INIT,
-NUM_SIMCALLS
-} e_smx_simcall_t;
+#include "simcalls_generated_enum.h" /* All possible simcalls (generated) */
 
 typedef int (*simix_match_func_t)(void *, void *, smx_action_t);
 typedef void (*simix_copy_data_func_t)(smx_action_t, void*, size_t);
@@ -63,7 +55,7 @@ typedef struct s_smx_simcall {
 #ifdef HAVE_MC
   int mc_value;
 #endif
-  union u_smx_scalar args[10];
+  union u_smx_scalar args[11];
   union u_smx_scalar result;
   //FIXME: union u_smx_scalar retval;
   union {
@@ -91,8 +83,8 @@ typedef struct s_smx_simcall {
 
 void SIMIX_simcall_push(smx_process_t self);
 void SIMIX_simcall_answer(smx_simcall_t);
-void SIMIX_simcall_pre(smx_simcall_t, int);
-void SIMIX_simcall_post(smx_action_t);
+void SIMIX_simcall_enter(smx_simcall_t, int);
+void SIMIX_simcall_exit(smx_action_t);
 smx_simcall_t SIMIX_simcall_mine(void);
 const char *SIMIX_simcall_name(e_smx_simcall_t kind);
 //TOFIX put it in a better place