X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45176f410366aa94795f4e48cc6282b262a4b3dd..fcb0b0f21b4416e7cae17a50d9534bb46f81946c:/src/msg/msg_private.h diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index 6f225e20f6..b71ae373c0 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -73,12 +73,14 @@ typedef struct simdata_file { /******************************* Process *************************************/ +namespace simgrid { class MsgActorExt { public: explicit MsgActorExt(void* d) : data(d) {} msg_error_t errno_ = MSG_OK; /* the last value returned by a MSG_function */ void* data = nullptr; /* user data */ }; +} typedef struct process_arg { const char *name; @@ -116,11 +118,9 @@ XBT_PRIVATE void __MSG_storage_destroy(msg_storage_priv_t host); XBT_PRIVATE void __MSG_file_destroy(msg_file_priv_t host); XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc); -XBT_PRIVATE smx_actor_t MSG_process_create_from_SIMIX(const char *name, - std::function code, void *data, - sg_host_t host, double kill_time, - xbt_dict_t properties, int auto_restart, - smx_actor_t parent_process); +XBT_PRIVATE smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::function code, void* data, + sg_host_t host, xbt_dict_t properties, + smx_actor_t parent_process); XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(smx_activity_t comm, void* buff, size_t buff_size); XBT_PRIVATE void MSG_post_create_environment(); @@ -154,9 +154,9 @@ XBT_PRIVATE void TRACE_msg_process_sleep_out(msg_process_t process); SG_END_DECL() -XBT_PUBLIC(msg_process_t) MSG_process_create_with_environment( - const char *name, std::function code, void *data, - msg_host_t host, xbt_dict_t properties); +XBT_PUBLIC(msg_process_t) +MSG_process_create_from_stdfunc(const char* name, std::function code, void* data, msg_host_t host, + xbt_dict_t properties); inline void simdata_task::setUsed() {