Port simcall_process_suspend to the modernity

[simgrid.git] / src / simix / popping_private.hpp

diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp
index be180ac..476c871 100644 (file)
--- a/src/simix/popping_private.hpp
+++ b/src/simix/popping_private.hpp
@@ -12,10 +12,10 @@
 #include <boost/intrusive_ptr.hpp>
 
 /********************************* Simcalls *********************************/
-XBT_PUBLIC_DATA const char* simcall_names[]; /* Name of each simcall */
-
 #include "popping_enum.h" /* Definition of e_smx_simcall_t, with one value per simcall */
 
+XBT_PUBLIC_DATA const char* simcall_names[]; /* Name of each simcall */
+
 typedef int (*simix_match_func_t)(void*, void*, simgrid::kernel::activity::CommImpl*);
 typedef void (*simix_copy_data_func_t)(simgrid::kernel::activity::CommImpl*, void*, size_t);
 typedef void (*simix_clean_func_t)(void*);
@@ -51,13 +51,11 @@ struct s_smx_simcall {
   u_smx_scalar result;
 };
 
-#define SIMCALL_SET_MC_VALUE(simcall, value) ((simcall)->mc_value = (value))
-#define SIMCALL_GET_MC_VALUE(simcall) ((simcall)->mc_value)
+#define SIMCALL_SET_MC_VALUE(simcall, value) ((simcall).mc_value = (value))
+#define SIMCALL_GET_MC_VALUE(simcall) ((simcall).mc_value)
 
 /******************************** General *************************************/
 
-XBT_PRIVATE void SIMIX_simcall_answer(smx_simcall_t simcall);
-XBT_PRIVATE void SIMIX_simcall_handle(smx_simcall_t simcall, int value);
 XBT_PRIVATE const char* SIMIX_simcall_name(e_smx_simcall_t kind);
 XBT_PRIVATE void SIMIX_run_kernel(std::function<void()> const* code);
 XBT_PRIVATE void SIMIX_run_blocking(std::function<void()> const* code);