X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bb6334038c8818cd48491012b60666f2f5ab94d9..47950eebfede4e41862022469d15e5e4fe19c7ba:/src/kernel/activity/CommImpl.hpp diff --git a/src/kernel/activity/CommImpl.hpp b/src/kernel/activity/CommImpl.hpp index 559fd9de46..7c0691aece 100644 --- a/src/kernel/activity/CommImpl.hpp +++ b/src/kernel/activity/CommImpl.hpp @@ -19,8 +19,11 @@ class XBT_PUBLIC CommImpl : public ActivityImpl_T { ~CommImpl() override; void cleanupSurf(); - double rate_ = 0.0; - double size_ = 0.0; + double rate_ = 0.0; + double size_ = 0.0; + bool detached_ = false; /* If detached or not */ + bool copied_ = false; /* whether the data were already copied */ + MailboxImpl* mbox_ = nullptr; /* Rendez-vous where the comm is queued */ public: enum class Type { SEND = 0, RECEIVE, READY, DONE }; @@ -30,7 +33,12 @@ public: CommImpl& set_src_buff(unsigned char* buff, size_t size); CommImpl& set_dst_buff(unsigned char* buff, size_t* size); CommImpl& set_rate(double rate); - double get_rate() { return rate_; } + CommImpl& set_mailbox(MailboxImpl* mbox); + CommImpl& detach(); + + double get_rate() const { return rate_; } + MailboxImpl* get_mailbox() const { return mbox_; } + bool detached() const { return detached_; } void copy_data(); @@ -41,15 +49,13 @@ public: void post() override; void finish() override; - CommImpl::Type type_; /* Type of the communication (SIMIX_COMM_SEND or SIMIX_COMM_RECEIVE) */ - MailboxImpl* mbox = nullptr; /* Rendez-vous where the comm is queued */ + CommImpl::Type type_; /* Type of the communication (SEND or RECEIVE) */ #if SIMGRID_HAVE_MC MailboxImpl* mbox_cpy = nullptr; /* Copy of the rendez-vous where the comm is queued, MC needs it for DPOR (comm.mbox set to nullptr when the communication is removed from the mailbox (used as garbage collector)) */ #endif - bool detached_ = false; /* If detached or not */ void (*clean_fun)(void*) = nullptr; /* Function to clean the detached src_buf if something goes wrong */ int (*match_fun)(void*, void*, CommImpl*) = nullptr; /* Filter function used by the other side. It is used when @@ -63,12 +69,11 @@ expectations of the other side, too. See */ actor::ActorImplPtr src_actor_ = nullptr; actor::ActorImplPtr dst_actor_ = nullptr; - /* Data to be transfered */ + /* Data to be transferred */ unsigned char* src_buff_ = nullptr; unsigned char* dst_buff_ = nullptr; size_t src_buff_size_ = 0; size_t* dst_buff_size_ = nullptr; - bool copied = false; /* whether the data were already copied */ void* src_data_ = nullptr; /* User data associated to the communication */ void* dst_data_ = nullptr;