X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..2a07cc1dc95048c86a3fc76aca2e9c088f7b5025:/include/simgrid/simix.hpp diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp index f21fa3d539..9b48080f25 100644 --- a/include/simgrid/simix.hpp +++ b/include/simgrid/simix.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2010, 2012-2017. The SimGrid Team. +/* Copyright (c) 2007-2019. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -12,10 +12,11 @@ #include #include -#include +#include #include +#include -XBT_PUBLIC(void) simcall_run_kernel(std::function const& code); +XBT_PUBLIC void simcall_run_kernel(std::function const& code); /** Execute some code in the kernel and block * @@ -26,7 +27,7 @@ XBT_PUBLIC(void) simcall_run_kernel(std::function const& code); * * @ref simix::kernelSync() is a higher level wrapper for this. */ -XBT_PUBLIC(void) simcall_run_blocking(std::function const& code); +XBT_PUBLIC void simcall_run_blocking(std::function const& code); template inline void simcall_run_kernel(F& f) @@ -40,7 +41,6 @@ void simcall_run_blocking(F& f) } namespace simgrid { - namespace simix { /** Execute some code in the kernel/maestro @@ -49,8 +49,7 @@ namespace simix { * More importantly, this enforces a deterministic/reproducible ordering * of the operation with respect to other simcalls. */ -template -typename std::result_of::type kernelImmediate(F&& code) +template typename std::result_of::type simcall(F&& code) { // If we are in the maestro, we take the fast path and execute the // code directly without simcall mashalling/unmarshalling/dispatch: @@ -62,71 +61,66 @@ typename std::result_of::type kernelImmediate(F&& code) // conveniently handles the success/failure value for us. typedef typename std::result_of::type R; simgrid::xbt::Result result; - simcall_run_kernel([&]{ - xbt_assert(SIMIX_is_maestro(), "Not in maestro"); - simgrid::xbt::fulfillPromise(result, std::forward(code)); - }); + simcall_run_kernel([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward(code)); }); return result.get(); } -XBT_PUBLIC(const std::vector&) process_get_runnable(); - -XBT_PUBLIC(void) set_maestro(std::function code); -XBT_PUBLIC(void) create_maestro(std::function code); +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 ActorCode based on argv: +// Create an ActorCode based on a std::string typedef std::function args)> ActorCodeFactory; -XBT_PUBLIC(void) registerFunction(const char* name, ActorCodeFactory factory); +XBT_PUBLIC void register_function(const std::string& name, const ActorCodeFactory& factory); -/** These functions will be called when we detect a deadlock: any remaining process is locked on an action - * - * If these functions manage to unlock some of the processes, then the deadlock will be avoided. - */ -extern simgrid::xbt::signal onDeadlock; -} -} +typedef std::pair TimerQelt; +static boost::heap::fibonacci_heap>> simix_timers; -/* - * Type of function that creates a process. - * The function must accept the following parameters: - * void* process: the process created will be stored there - * const char *name: a name for the object. It is for user-level information and can be NULL - * xbt_main_func_t code: is a function describing the behavior of the process - * void *data: data a pointer to any data one may want to attach to the new object. - * sg_host_t host: the location where the new process is executed - * int argc, char **argv: parameters passed to code - * std::map* props: properties - */ -typedef smx_actor_t (*smx_creation_func_t)( - /* name */ const char*, std::function code, - /* userdata */ void*, - /* hostname */ sg_host_t, - /* props */ std::map*, - /* parent_process */ smx_actor_t); +/** @brief Timer datatype */ +class Timer { + double date = 0.0; -extern "C" -XBT_PUBLIC(void) SIMIX_function_register_process_create(smx_creation_func_t function); +public: + decltype(simix_timers)::handle_type handle_; -XBT_PUBLIC(smx_actor_t) -simcall_process_create(const char* name, std::function code, void* data, sg_host_t host, - std::map* properties); + Timer(double date, simgrid::xbt::Task&& callback) : date(date), callback(std::move(callback)) {} -XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, simgrid::xbt::Task callback); + simgrid::xbt::Task callback; + double get_date() { return date; } + void remove(); -template inline -smx_timer_t SIMIX_timer_set(double date, F callback) -{ - return SIMIX_timer_set(date, simgrid::xbt::Task(std::move(callback))); -} + template static inline Timer* set(double date, F callback) + { + return set(date, simgrid::xbt::Task(std::move(callback))); + } -template inline -smx_timer_t SIMIX_timer_set(double date, R(*callback)(T*), T* arg) -{ - return SIMIX_timer_set(date, [=](){ callback(arg); }); -} + 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; } +}; + +} // 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