X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1fd762bbcbc15aa4ffafe2d15df5cb650d1fa1ff..ea74f5d95928a521a588737e81f1de94eef25d19:/include/simgrid/simix.hpp diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp index 9b48080f25..c9902637d6 100644 --- a/include/simgrid/simix.hpp +++ b/include/simgrid/simix.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. +/* Copyright (c) 2007-2022. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -7,120 +7,99 @@ #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); - -/** Execute some code in the kernel and block - * - * run_blocking() is a generic blocking simcall. It is given a callback - * which is executed immediately in the SimGrid kernel. The callback is - * responsible for setting the suitable logic for waking up the process - * when needed. - * - * @ref simix::kernelSync() is a higher level wrapper for this. - */ -XBT_PUBLIC void simcall_run_blocking(std::function const& code); - -template inline -void simcall_run_kernel(F& f) -{ - simcall_run_kernel(std::function(std::ref(f))); -} -template inline -void simcall_run_blocking(F& f) -{ - simcall_run_blocking(std::function(std::ref(f))); -} +XBT_PUBLIC void simcall_run_kernel(std::function const& code, + simgrid::kernel::actor::SimcallObserver* observer); +XBT_PUBLIC void simcall_run_blocking(std::function const& code, + simgrid::kernel::actor::SimcallObserver* observer); namespace simgrid { -namespace simix { +namespace kernel { +namespace actor { -/** Execute some code in the kernel/maestro +/** 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. + * + * 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, + * allowing the whole MC business. + * + * It is highly inspired from the syscalls in a regular operating system, allowing the user code to get some specific + * code executed in the kernel context. But here, there is almost no security involved. Parameters get checked for + * finiteness but that's all. The main goal remain to ensure reproducible ordering of uncomparable events (in + * [parallel] simulation) and observability of events (in model-checking). * - * This can be used to enforce mutual exclusion with other simcall. - * More importantly, this enforces a deterministic/reproducible ordering - * of the operation with respect to other simcalls. + * The code passed as argument is supposed to terminate at the exact same simulated timestamp. + * Do not use it if your code may block waiting for a subsequent event, e.g. if you lock a mutex, + * 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::type simcall(F&& code) +template typename std::result_of_t simcall(F&& code, SimcallObserver* observer = nullptr) { // If we are in the maestro, we take the fast path and execute the - // code directly without simcall mashalling/unmarshalling/dispatch: - if (SIMIX_is_maestro()) + // code directly without simcall marshalling/unmarshalling/dispatch: + if (s4u::Actor::is_maestro()) return std::forward(code)(); // 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 // conveniently handles the success/failure value for us. - typedef typename std::result_of::type R; + using R = typename std::result_of_t; simgrid::xbt::Result result; - simcall_run_kernel([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward(code)); }); + simcall_run_kernel([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward(code)); }, observer); return result.get(); } -XBT_ATTRIB_DEPRECATED_v325("Please manifest if you actually need this function") - XBT_PUBLIC const std::vector& process_get_runnable(); - -// What's executed as SIMIX actor code: -typedef std::function ActorCode; - -// Create an ActorCode based on a std::string -typedef std::function args)> ActorCodeFactory; - -XBT_PUBLIC void register_function(const std::string& name, const ActorCodeFactory& factory); - -typedef std::pair TimerQelt; -static boost::heap::fibonacci_heap>> simix_timers; - -/** @brief Timer datatype */ -class Timer { - double date = 0.0; - -public: - decltype(simix_timers)::handle_type handle_; - - Timer(double date, simgrid::xbt::Task&& callback) : date(date), callback(std::move(callback)) {} +/** 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 + * actor->simcall_answer() is called explicitly. + * + * 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 + * the first actor from the queue, mark it as current owner of the mutex and call actor->simcall_answer() to mark that + * this mutex is now unblocked and ready to run again. If the mutex is initially free, the calling actor is unblocked + * 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 void simcall_blocking(F&& code, SimcallObserver* observer = nullptr) +{ + xbt_assert(not s4u::Actor::is_maestro(), "Cannot execute blocking call in kernel mode"); - simgrid::xbt::Task callback; - double get_date() { return date; } - void remove(); + // 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)); }, observer); + result.get(); // rethrow stored exception if any +} - template static inline Timer* set(double date, F callback) - { - return set(date, simgrid::xbt::Task(std::move(callback))); - } +template +auto simcall_blocking(F&& code, Observer* observer) -> decltype(observer->get_result()) +{ + simcall_blocking(std::forward(code), static_cast(observer)); + return observer->get_result(); +} +} // namespace actor +} // namespace kernel - template - XBT_ATTRIB_DEPRECATED_v325("Please use a lambda or std::bind") static inline Timer* set(double date, - R (*callback)(T*), T* arg) - { - return set(date, std::bind(callback, arg)); - } +namespace simix { - XBT_ATTRIB_DEPRECATED_v325("Please use a lambda or std::bind") static Timer* set(double date, void (*callback)(void*), - void* arg) - { - return set(date, std::bind(callback, arg)); - } - static Timer* set(double date, simgrid::xbt::Task&& callback); - static double next() { return simix_timers.empty() ? -1.0 : simix_timers.top().first; } -}; +XBT_PUBLIC void unblock(smx_actor_t process); } // namespace simix } // namespace simgrid -XBT_PUBLIC smx_actor_t simcall_process_create(const std::string& name, const simgrid::simix::ActorCode& code, - void* data, sg_host_t host, - std::unordered_map* properties); - -XBT_ATTRIB_DEPRECATED_v325("Please use simgrid::xbt::Timer::set") XBT_PUBLIC smx_timer_t - SIMIX_timer_set(double date, simgrid::xbt::Task&& callback); - #endif