X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ddb45d457a6e56461f506cba0add22902ef2c7d7..a14791b7288177a49b6e8b06677d59faac0a175e:/src/simix/popping_private.hpp diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp index 745d0e614b..73ef058847 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. */ @@ -13,45 +13,36 @@ #include /********************************* Simcalls *********************************/ -#include "popping_enum.hpp" /* Definition of Simcall, with one value per simcall */ +namespace simgrid { +namespace simix { +/** All possible simcalls. */ +enum class Simcall { + NONE, + RUN_KERNEL, + RUN_BLOCKING, +}; +constexpr int NUM_SIMCALLS = 3; +/** @brief Simcalls' names */ +} // namespace simix +} // namespace simgrid XBT_PUBLIC_DATA const std::array simcall_names; /* Name of each simcall */ using simix_match_func_t = bool (*)(void*, void*, simgrid::kernel::activity::CommImpl*); using simix_copy_data_func_t = void (*)(simgrid::kernel::activity::CommImpl*, void*, size_t); using simix_clean_func_t = void (*)(void*); -using FPtr = void (*)(); // Hide the ugliness - -/* Pack all possible scalar types in an union */ -union u_smx_scalar { - bool b; - char c; - short s; - int i; - long l; - long long ll; - unsigned char uc; - unsigned short us; - unsigned int ui; - unsigned long ul; - unsigned long long ull; - double d; - void* dp; - FPtr fp; -}; /** * @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::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. - int mc_value_ = 0; - std::array args_ = {}; - u_smx_scalar result_ = {}; + 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::function const* code_ = nullptr; }; /******************************** General *************************************/ @@ -60,149 +51,4 @@ XBT_PRIVATE const char* SIMIX_simcall_name(const s_smx_simcall& simcall); XBT_PRIVATE void SIMIX_run_kernel(std::function const* code); XBT_PRIVATE void SIMIX_run_blocking(std::function 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() - * function builds a new intrusive_ptr wrapping the pointer (that is stored raw - * within the simcall) while the unmarshal_raw retrieves the raw pointer. - * - * This is used in _getraw_ functions, that allow the - * model-checker, to read the data in the remote memory of the MCed. - */ - -namespace simgrid { -namespace simix { - -template class type { - constexpr bool operator==(type) const { return true; } - template constexpr bool operator==(type) const { return false; } - constexpr bool operator!=(type) const { return false; } - template constexpr bool operator!=(type) const { return true; } -}; - -template struct marshal_t { -}; -#define SIMIX_MARSHAL(T, field) \ - inline void marshal(type, u_smx_scalar& simcall, T value) { simcall.field = value; } \ - inline T unmarshal(type, u_smx_scalar const& simcall) { return simcall.field; } \ - inline T unmarshal_raw(type, u_smx_scalar const& simcall) \ - { /* Exactly same as unmarshal. It differs only for intrusive_ptr */ return simcall.field; } - -SIMIX_MARSHAL(bool, b) -SIMIX_MARSHAL(char, c) -SIMIX_MARSHAL(short, s) -SIMIX_MARSHAL(int, i) -SIMIX_MARSHAL(long, l) -SIMIX_MARSHAL(unsigned char, uc) -SIMIX_MARSHAL(unsigned short, us) -SIMIX_MARSHAL(unsigned int, ui) -SIMIX_MARSHAL(unsigned long, ul) -SIMIX_MARSHAL(unsigned long long, ull) -SIMIX_MARSHAL(long long, ll) -SIMIX_MARSHAL(float, d) -SIMIX_MARSHAL(double, d) -SIMIX_MARSHAL(FPtr, fp) - -inline void unmarshal(type, u_smx_scalar const& /*simcall*/) -{ - /* Nothing to do for void data */ -} -inline void unmarshal_raw(type, u_smx_scalar const& /*simcall*/) -{ - /* Nothing to do for void data */ -} - -template inline void marshal(type, u_smx_scalar& simcall, T* value) -{ - simcall.dp = (void*)value; -} -template inline T* unmarshal(type, u_smx_scalar const& simcall) -{ - return static_cast(simcall.dp); -} -template inline T* unmarshal_raw(type, u_smx_scalar const& simcall) -{ - return static_cast(simcall.dp); -} - -template -inline void marshal(type>, u_smx_scalar& simcall, boost::intrusive_ptr value) -{ - if (value.get() == nullptr) { // Sometimes we return nullptr in an intrusive_ptr... - simcall.dp = nullptr; - } else { - intrusive_ptr_add_ref(value.get()); - simcall.dp = static_cast(value.get()); - } -} -template inline boost::intrusive_ptr unmarshal(type>, u_smx_scalar const& simcall) -{ - // refcount was already increased during the marshaling, thus the "false" as last argument - boost::intrusive_ptr res = boost::intrusive_ptr(static_cast(simcall.dp), false); - return res; -} -template inline T* unmarshal_raw(type>, u_smx_scalar const& simcall) -{ - return static_cast(simcall.dp); -} - -template inline void marshal(type, u_smx_scalar& simcall, R (*value)(T...)) -{ - simcall.fp = (FPtr)value; -} -template inline auto unmarshal(type, u_smx_scalar simcall) -> R (*)(T...) -{ - return (R(*)(T...))simcall.fp; -} -template inline auto unmarshal_raw(type, u_smx_scalar simcall) -> R (*)(T...) -{ - return (R(*)(T...))simcall.fp; -} - -template inline void marshal(u_smx_scalar& simcall, T const& value) -{ - return marshal(type(), simcall, value); -} -template inline typename std::remove_reference_t unmarshal(u_smx_scalar& simcall) -{ - return unmarshal(type(), simcall); -} -template inline typename std::remove_reference_t unmarshal_raw(u_smx_scalar& simcall) -{ - return unmarshal(type(), simcall); -} - -template inline void marshal_args(const s_smx_simcall* /*simcall*/) -{ - /* Nothing to do when no args */ -} - -template inline void marshal_args(smx_simcall_t simcall, A const& a) -{ - marshal(simcall->args_[I], a); -} - -template inline void marshal_args(smx_simcall_t simcall, A const& a, B const&... b) -{ - marshal(simcall->args_[I], a); - marshal_args(simcall, b...); -} - -/** Initialize the simcall */ -template inline void marshal(smx_simcall_t simcall, Simcall call, A const&... a) -{ - simcall->call_ = call; - memset(&simcall->result_, 0, sizeof simcall->result_); - memset(simcall->args_.data(), 0, simcall->args_.size() * sizeof simcall->args_[0]); - marshal_args<0>(simcall, a...); -} -} -} - -#include "popping_accessors.hpp" - #endif