X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/afa62e573131c8a346d4703b58037ee1ff80e69e..8ec63ad549cad884dad1c08e901671496d548a4d:/include/simgrid/simix.hpp diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp index 2b979d735d..324062ca3f 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-2020. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -16,11 +16,12 @@ #include #include -XBT_PUBLIC void simcall_run_kernel(std::function const& code); -XBT_PUBLIC void simcall_run_blocking(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); namespace simgrid { -namespace simix { +namespace kernel { +namespace actor { /** Execute some code in kernel context on behalf of the user code. * @@ -33,18 +34,18 @@ namespace simix { * * 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 - * finitness but that's all. The main goal remain to ensure reproductible ordering of uncomparable events (in [parallel] - * simulation) and observability of events (in model-checking). + * 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). * * 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::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 mashalling/unmarshalling/dispatch: + // code directly without simcall marshalling/unmarshalling/dispatch: if (SIMIX_is_maestro()) return std::forward(code)(); @@ -53,14 +54,17 @@ template typename std::result_of::type simcall(F&& code) // 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_kernel([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward(code)); }, t); 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 - * actor->simcall_answer() is called explicitely. + * 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 @@ -71,32 +75,26 @@ template typename std::result_of::type simcall(F&& code) * * If your code never calls actor->simcall_answer() itself, the actor will never return from its simcall. */ -template typename std::result_of::type simcall_blocking(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_blocking([&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(); } +} // namespace actor +} // namespace kernel +} // namespace simgrid +namespace simgrid { +namespace simix { -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; @@ -111,7 +109,7 @@ public: Timer(double date, simgrid::xbt::Task&& callback) : date(date), callback(std::move(callback)) {} simgrid::xbt::Task callback; - double get_date() { return date; } + double get_date() const { return date; } void remove(); template static inline Timer* set(double date, F callback) @@ -119,18 +117,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; } }; @@ -138,11 +124,4 @@ public: } // 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