X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bd11885138355943e56e13d03850740ea2bcabd7..cb1f41e17133f75d16ce09edee442cda1ae579b6:/include/simgrid/simix.hpp diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp index 9662eb017d..6e17fd6ebc 100644 --- a/include/simgrid/simix.hpp +++ b/include/simgrid/simix.hpp @@ -16,46 +16,84 @@ #include #include -XBT_PUBLIC void simcall_run_kernel(std::function const& code); +XBT_PUBLIC void simcall_run_kernel(std::function const& code, simgrid::mc::SimcallInspector* t); +XBT_PUBLIC void simcall_run_blocking(std::function const& code, simgrid::mc::SimcallInspector* t); -/** Execute some code in the kernel and block +namespace simgrid { +namespace kernel { +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. + * + * 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. * - * 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. + * 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). * - * @ref simix::kernelSync() is a higher level wrapper for this. + * 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. */ -XBT_PUBLIC void simcall_run_blocking(std::function const& code); +template typename std::result_of::type simcall(F&& code, mc::SimcallInspector* t = 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)(); -namespace simgrid { -namespace simix { + // 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; + simgrid::xbt::Result result; + simcall_run_kernel([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward(code)); }, t); + return result.get(); +} -/** Execute some code in the kernel/maestro +/** 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. + * + * 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 + * 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. * - * 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. + * If your code never calls actor->simcall_answer() itself, the actor will never return from its simcall. */ -template typename std::result_of::type simcall(F&& code) +template R simcall_blocking(F&& code, mc::SimcallInspector* t = nullptr) { // If we are in the maestro, we take the fast path and execute the - // code directly without simcall mashalling/unmarshalling/dispatch: + // code directly without simcall marshalling/unmarshalling/dispatch: if (SIMIX_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; simgrid::xbt::Result result; - simcall_run_kernel([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward(code)); }); + simcall_run_blocking([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward(code)); }, t); return result.get(); } - -XBT_ATTRIB_DEPRECATED_v325("Please manifest if you actually need this function") - XBT_PUBLIC const std::vector& process_get_runnable(); +} // namespace actor +} // namespace kernel +} // namespace simgrid +namespace simgrid { +namespace simix { // What's executed as SIMIX actor code: typedef std::function ActorCode; @@ -86,18 +124,6 @@ public: return set(date, simgrid::xbt::Task(std::move(callback))); } - 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)); - } - - 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; } }; @@ -109,7 +135,4 @@ XBT_PUBLIC smx_actor_t simcall_process_create(const std::string& name, const sim 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