Modernize simcall mutex_trylock.

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

diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp
index 043c45234408d17490076765c93cdc43b4bcb599..a0f1add9d2f928330fd5d8c6fc58859c0e138341 100644 (file)
--- a/src/simix/popping_private.hpp
+++ b/src/simix/popping_private.hpp
@@ -44,18 +44,16 @@ union u_smx_scalar {
  * @brief Represents a simcall to the kernel.
  */
 struct s_smx_simcall {
-  simgrid::simix::Simcall call_             = simgrid::simix::Simcall::NONE;
-  smx_actor_t issuer_                       = nullptr;
-  smx_timer_t timeout_cb_                   = nullptr; // Callback to timeouts
-  simgrid::mc::SimcallInspector* inspector_ = nullptr; // makes that simcall observable by the MC
-  int mc_value_                             = 0;
-  std::array<u_smx_scalar, 11> args_        = {};
-  u_smx_scalar result_                      = {};
+  simgrid::simix::Simcall call_           = simgrid::simix::Simcall::NONE;
+  smx_actor_t issuer_                     = nullptr;
+  smx_timer_t timeout_cb_                 = nullptr; // Callback to timeouts
+  simgrid::mc::SimcallObserver* observer_ = nullptr; // makes that simcall observable by the MC
+  unsigned int mc_max_consider_ = 0; // How many times this simcall should be used. If >1, this will be a fork.
+  int mc_value_                           = 0;
+  std::array<u_smx_scalar, 11> args_      = {};
+  u_smx_scalar result_                    = {};
 };
 
-#define SIMCALL_SET_MC_VALUE(simcall, value) ((simcall).mc_value_ = (value))
-#define SIMCALL_GET_MC_VALUE(simcall) ((simcall).mc_value_)
-
 /******************************** General *************************************/
 
 XBT_PRIVATE const char* SIMIX_simcall_name(simgrid::simix::Simcall kind);
@@ -169,11 +167,11 @@ template <class T> inline void marshal(u_smx_scalar& simcall, T const& value)
 {
   return marshal(type<T>(), simcall, value);
 }
-template <class T> inline typename std::remove_reference<T>::type unmarshal(u_smx_scalar& simcall)
+template <class T> inline typename std::remove_reference_t<T> unmarshal(u_smx_scalar& simcall)
 {
   return unmarshal(type<T>(), simcall);
 }
-template <class T> inline typename std::remove_reference<T>::type unmarshal_raw(u_smx_scalar& simcall)
+template <class T> inline typename std::remove_reference_t<T> unmarshal_raw(u_smx_scalar& simcall)
 {
   return unmarshal(type<T>(), simcall);
 }