X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18bdb6eb6cd157e6f674f2621235635beb74d5c3..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/include/simgrid/simix.hpp diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp index 76fd191006..8817ccca53 100644 --- a/include/simgrid/simix.hpp +++ b/include/simgrid/simix.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2021. The SimGrid Team. +/* Copyright (c) 2007-2023. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -7,18 +7,19 @@ #ifndef SIMGRID_SIMIX_HPP #define SIMGRID_SIMIX_HPP -#include -#include +#include #include #include -#include -#include #include #include -XBT_PUBLIC void simcall_run_kernel(std::function const& code, simgrid::mc::SimcallObserver* t); -XBT_PUBLIC void simcall_run_blocking(std::function const& code, simgrid::mc::SimcallObserver* t); +XBT_PUBLIC void simcall_run_answered(std::function const& code, + simgrid::kernel::actor::SimcallObserver* observer); +XBT_PUBLIC void simcall_run_blocking(std::function const& code, + simgrid::kernel::actor::SimcallObserver* observer); +XBT_PUBLIC void simcall_run_object_access(std::function const& code, + simgrid::kernel::actor::ObjectAccessSimcallItem* item); namespace simgrid { namespace kernel { @@ -27,7 +28,7 @@ namespace actor { /** Execute some code in kernel context on behalf of the user code. * * Every modification of the environment must be protected this way: every setter, constructor and similar. - * Getters don't have to be protected this way. + * Getters don't have to be protected this way, and setters may use the simcall_object_access() variant (see below). * * This allows deterministic parallel simulation without any locking, even if almost nobody uses parallel simulation in * SimGrid. More interestingly it makes every modification of the simulated world observable by the model-checker, @@ -43,11 +44,11 @@ namespace actor { * you may need to wait for that mutex to be unlocked by its current owner. * Potentially blocking simcall must be issued using simcall_blocking(), right below in this file. */ -template typename std::result_of_t simcall(F&& code, mc::SimcallObserver* t = nullptr) +template typename std::result_of_t simcall_answered(F&& code, SimcallObserver* observer = nullptr) { // If we are in the maestro, we take the fast path and execute the // code directly without simcall marshalling/unmarshalling/dispatch: - if (SIMIX_is_maestro()) + if (s4u::Actor::is_maestro()) return std::forward(code)(); // If we are in the application, pass the code to the maestro which @@ -55,18 +56,38 @@ template typename std::result_of_t simcall(F&& code, mc::SimcallO // conveniently handles the success/failure value for us. using R = typename std::result_of_t; simgrid::xbt::Result result; - simcall_run_kernel([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward(code)); }, t); + simcall_run_answered([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward(code)); }, observer); + return result.get(); +} + +/** Use a setter on the `item` object. That's a simcall only if running in parallel or with MC activated. + * + * Simulation without MC and without parallelism (contexts/nthreads=1) will not pay the price of a simcall for an + * harmless setter. When running in parallel, you want your write access to be done in a mutual exclusion way, while the + * getters can still occure out of order. + * + * When running in MC, you want to make this access visible to the checker. Actually in this case, it's not visible from + * the checker (and thus still use a fast track) if the setter is called from the actor that created the object. + */ +template typename std::result_of_t simcall_object_access(ObjectAccessSimcallItem* item, F&& code) +{ + // If we are in the maestro, we take the fast path and execute the code directly + if (simgrid::s4u::Actor::is_maestro()) + return std::forward(code)(); + + // If called from another thread, do a real simcall. It will be short-cut on need + using R = typename std::result_of_t; + simgrid::xbt::Result result; + simcall_run_object_access([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward(code)); }, item); + return result.get(); } /** Execute some code (that does not return immediately) in kernel context * - * This is very similar to simcall() right above, but the calling actor will not get rescheduled until + * This is very similar to simcall_answered() above, but the calling actor will not get rescheduled until * actor->simcall_answer() is called explicitly. * - * Since the return value does not come from the lambda directly, its type cannot be guessed automatically and must - * be provided as template parameter. - * * This is meant for blocking actions. For example, locking a mutex is a blocking simcall. * First it's a simcall because that's obviously a modification of the world. Then, that's a blocking simcall because if * the mutex happens not to be free, the actor is added to a queue of actors in the mutex. Every mutex->unlock() takes @@ -75,57 +96,28 @@ template typename std::result_of_t simcall(F&& code, mc::SimcallO * right away with actor->simcall_answer() once the mutex is marked as locked. * * If your code never calls actor->simcall_answer() itself, the actor will never return from its simcall. + * + * The return value is obtained from observer->get_result() if it exists. Otherwise void is returned. */ -template R simcall_blocking(F&& code, mc::SimcallObserver* t = nullptr) +template void simcall_blocking(F&& code, SimcallObserver* observer = nullptr) { - // If we are in the maestro, we take the fast path and execute the - // code directly without simcall marshalling/unmarshalling/dispatch: - if (SIMIX_is_maestro()) - return std::forward(code)(); + xbt_assert(not s4u::Actor::is_maestro(), "Cannot execute blocking call in kernel mode"); - // If we are in the application, pass the code to the maestro which - // executes it for us and reports the result. We use a std::future which + // Pass the code to the maestro which executes it for us and reports the result. We use a std::future which // conveniently handles the success/failure value for us. - simgrid::xbt::Result result; - simcall_run_blocking([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward(code)); }, t); - return result.get(); + simgrid::xbt::Result result; + simcall_run_blocking([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward(code)); }, observer); + result.get(); // rethrow stored exception if any } -} // namespace actor -} // namespace kernel -} // namespace simgrid -namespace simgrid { -namespace simix { -inline auto& simix_timers() // avoid static initialization order fiasco +template +auto simcall_blocking(F&& code, Observer* observer) -> decltype(observer->get_result()) { - using TimerQelt = std::pair; - static boost::heap::fibonacci_heap>> value; - return value; + simcall_blocking(std::forward(code), static_cast(observer)); + return observer->get_result(); } - -/** @brief Timer datatype */ -class Timer { - double date = 0.0; - -public: - std::remove_reference_t::handle_type handle_; - - Timer(double date, simgrid::xbt::Task&& callback) : date(date), callback(std::move(callback)) {} - - simgrid::xbt::Task callback; - double get_date() const { return date; } - void remove(); - - template static inline Timer* set(double date, F callback) - { - return set(date, simgrid::xbt::Task(std::move(callback))); - } - - static Timer* set(double date, simgrid::xbt::Task&& callback); - static double next() { return simix_timers().empty() ? -1.0 : simix_timers().top().first; } -}; - -} // namespace simix +// compact namespaces are C++17 and this is a public header file so let's stick to C++14 +} // namespace actor +} // namespace kernel } // namespace simgrid - #endif