X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18bdb6eb6cd157e6f674f2621235635beb74d5c3..9b8e91c4ab7d0acb4161de83da283774b9d59a6c:/src/simix/popping_private.hpp

diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp
index e7abda9f18..19c4084f77 100644
--- a/src/simix/popping_private.hpp
+++ b/src/simix/popping_private.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2022. 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,29 +44,23 @@ 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::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;
+  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.
   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);
 
 /* Defines the marshal/unmarshal functions for each type of parameters.
- *
- * They will be used in popping_accessors.hpp to define the functions allowing
- * to retrieve/set each parameter of each simcall.
  *
  * There is a unmarshal_raw() function, which is exactly similar to unmarshal()
  * for all types but boost::intrusive_ptr(T). For that type, the unmarshal()
@@ -206,6 +200,4 @@ template <class... A> inline void marshal(smx_simcall_t simcall, Simcall call, A
 }
 }
 
-#include "popping_accessors.hpp"
-
 #endif