X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6042678d235eeddfa0b7120c17c7fb4362881a88..9fd6cbc6c3b06f4b09e3c3339ffb3cc8a68f9bfa:/src/msg/msg_private.hpp diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp index 45ea718663..d65129c89e 100644 --- a/src/msg/msg_private.hpp +++ b/src/msg/msg_private.hpp @@ -51,12 +51,6 @@ private: namespace simgrid { namespace msg { -class ActorExt { -public: - explicit ActorExt(void* d) : data(d) {} - msg_error_t errno_ = MSG_OK; /* the last value returned by a MSG_function */ - void* data = nullptr; /* user data */ -}; class Comm { public: @@ -85,8 +79,9 @@ XBT_PUBLIC_DATA MSG_Global_t msg_global; /*************************************************************/ 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, std::map* properties, +XBT_PRIVATE smx_actor_t MSG_process_create_from_SIMIX(std::string name, simgrid::simix::ActorCode code, void* data, + sg_host_t host, + std::unordered_map* 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); @@ -102,8 +97,6 @@ XBT_PRIVATE void TRACE_msg_task_get_start(); XBT_PRIVATE void TRACE_msg_task_put_start(msg_task_t task); XBT_PRIVATE void TRACE_msg_task_put_end(); -/* declaration of instrumentation functions from msg_process_instr.c */ -XBT_PRIVATE void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t process); inline void s_simdata_task_t::setUsed() {