X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d1f73ed29652d96dc7644de4c7cfc64c2e199b4..4775ee0f232bccc4978dfbfb8153b7593be7dd77:/include/simgrid/simix.hpp diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp index 7e0e9e3cd5..eb7e26b88a 100644 --- a/include/simgrid/simix.hpp +++ b/include/simgrid/simix.hpp @@ -7,12 +7,13 @@ #ifndef SIMGRID_SIMIX_HPP #define SIMGRID_SIMIX_HPP -//#include -#include +#include #include +#include #include -#include +#include +#include XBT_PUBLIC(void) simcall_run_kernel(std::function const& code); @@ -97,21 +98,21 @@ extern simgrid::xbt::signal onDeadlock; * 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 - * xbt_dict_t pros: properties + * 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 */ xbt_dict_t, - /* parent_process */ smx_actor_t); +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); 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, xbt_dict_t properties); +simcall_process_create(const char* name, std::function code, void* data, sg_host_t host, + std::map* properties); XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, simgrid::xbt::Task callback);