X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b9f8f01f1e31a9cec9df207ad241e9c732790cc1..5fec5d08d744431061257ced7d7244182468b2f8:/src/simix/popping_private.hpp

diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp
index a095be665f..13ab4f17ac 100644
--- a/src/simix/popping_private.hpp
+++ b/src/simix/popping_private.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -44,21 +44,20 @@ 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;
+  simgrid::kernel::timer::Timer* timeout_cb_         = nullptr; // Callback to timeouts
+  simgrid::kernel::actor::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 in the state space.
+  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);
+XBT_PRIVATE const char* SIMIX_simcall_name(const s_smx_simcall& simcall);
 XBT_PRIVATE void SIMIX_run_kernel(std::function<void()> const* code);
 XBT_PRIVATE void SIMIX_run_blocking(std::function<void()> const* code);
 
@@ -169,11 +168,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);
 }