X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd7651841882fc2795ff07da448a240dbdc90220..d0694c51e5ea965a0c5851c58b58af7c70a62af3:/src/msg/msg_private.h diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index b0831034d1..a62d92cc92 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -30,9 +30,6 @@ public: typedef struct simdata_task { ~simdata_task() { - if (this->compute) - this->compute->unref(); - /* parallel tasks only */ xbt_free(this->host_list); } @@ -42,8 +39,8 @@ typedef struct simdata_task { this->isused = false; } - simgrid::kernel::activity::ExecImpl* compute = nullptr; /* SIMIX modeling of computation */ - simgrid::kernel::activity::CommImpl* comm = nullptr; /* SIMIX modeling of communication */ + simgrid::kernel::activity::ExecImplPtr compute = nullptr; /* SIMIX modeling of computation */ + simgrid::kernel::activity::CommImplPtr comm = nullptr; /* SIMIX modeling of communication */ double bytes_amount = 0.0; /* Data size */ double flops_amount = 0.0; /* Computation size */ msg_process_t sender = nullptr; @@ -73,13 +70,15 @@ typedef struct simdata_file { /******************************* Process *************************************/ namespace simgrid { -class MsgActorExt { +namespace msg { +class ActorExt { public: - explicit MsgActorExt(void* d) : data(d) {} + 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 */ }; } +} typedef struct msg_comm { smx_activity_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */