X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/42a5c2c5fa27026391c465eb71f8c6486b6af403..783573d576fa9ac43c007c6031bce185d882f92b:/include/simgrid/simix.hpp diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp index 66cdfb1f11..7e0e9e3cd5 100644 --- a/include/simgrid/simix.hpp +++ b/include/simgrid/simix.hpp @@ -7,14 +7,7 @@ #ifndef SIMGRID_SIMIX_HPP #define SIMGRID_SIMIX_HPP -#include - -#include -#include -#include -#include - -#include +//#include #include #include #include @@ -111,32 +104,25 @@ typedef smx_actor_t (*smx_creation_func_t) ( std::function code, /* userdata */ void*, /* hostname */ sg_host_t, - /* kill_time */ double, /* props */ xbt_dict_t, - /* auto_restart */ int, /* parent_process */ smx_actor_t); extern "C" 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, - double kill_time, - xbt_dict_t properties, - int auto_restart); +XBT_PUBLIC(smx_actor_t) +simcall_process_create(const char* name, std::function code, void* data, sg_host_t host, xbt_dict_t properties); XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, simgrid::xbt::Task callback); template inline -XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, F callback) +smx_timer_t SIMIX_timer_set(double date, F callback) { return SIMIX_timer_set(date, simgrid::xbt::Task(std::move(callback))); } template inline -XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, R(*callback)(T*), T* arg) +smx_timer_t SIMIX_timer_set(double date, R(*callback)(T*), T* arg) { return SIMIX_timer_set(date, [=](){ callback(arg); }); }