X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/611d822b02f836d7abe031cced6adc4281ef4356..86fc1e3c11c1ed868c5f3c4175b654a150fcd1a7:/include/simgrid/simix.hpp diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp index ac29c00906..06a9e30065 100644 --- a/include/simgrid/simix.hpp +++ b/include/simgrid/simix.hpp @@ -12,8 +12,8 @@ #include #include -#include #include +#include XBT_PUBLIC void simcall_run_kernel(std::function const& code); @@ -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,10 +61,7 @@ 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([&] { simgrid::xbt::fulfill_promise(result, std::forward(code)); }); return result.get(); } @@ -77,13 +73,8 @@ typedef std::function ActorCode; // Create ActorCode based on argv: typedef std::function args)> ActorCodeFactory; -XBT_PUBLIC void registerFunction(const char* name, ActorCodeFactory factory); +XBT_PUBLIC void register_function(const char* name, 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; } } @@ -102,13 +93,13 @@ typedef smx_actor_t (*smx_creation_func_t)( /* name */ const char*, std::function code, /* userdata */ void*, /* hostname */ sg_host_t, - /* props */ std::map*, + /* props */ std::unordered_map*, /* parent_process */ smx_actor_t); -extern "C" XBT_PUBLIC void SIMIX_function_register_process_create(smx_creation_func_t function); +XBT_PUBLIC void SIMIX_function_register_process_create(smx_creation_func_t function); XBT_PUBLIC smx_actor_t simcall_process_create(const char* name, std::function code, void* data, sg_host_t host, - std::map* properties); + std::unordered_map* properties); XBT_PUBLIC smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task callback);