Modernize simcall mutex_trylock.

[simgrid.git] / src / kernel / activity / CommImpl.hpp

diff --git a/src/kernel/activity/CommImpl.hpp b/src/kernel/activity/CommImpl.hpp
index c47f7489ff05c82a15d8ab3545e7de52b12b1d46..3fb4d8a73e70c97d973552f1c8c020c485a27d35 100644 (file)
--- a/src/kernel/activity/CommImpl.hpp
+++ b/src/kernel/activity/CommImpl.hpp
@@ -17,7 +17,7 @@ namespace activity {
 
 class XBT_PUBLIC CommImpl : public ActivityImpl_T<CommImpl> {
   ~CommImpl() override;
-  void cleanupSurf();
+  void cleanup_surf();
 
   double rate_       = 0.0;
   double size_       = 0.0;
@@ -26,12 +26,11 @@ class XBT_PUBLIC CommImpl : public ActivityImpl_T<CommImpl> {
   MailboxImpl* mbox_ = nullptr; /* Rendez-vous where the comm is queued */
 
 public:
-  CommImpl() = default;
-  CommImpl(s4u::Host* from, s4u::Host* to, double bytes);
+  enum class Type { SEND, RECEIVE };
 
-  enum class Type { SEND = 0, RECEIVE, READY, DONE };
+  explicit CommImpl(Type type) : type_(type) {}
+  CommImpl(s4u::Host* from, s4u::Host* to, double bytes);
 
-  CommImpl& set_type(CommImpl::Type type);
   CommImpl& set_size(double size);
   CommImpl& set_src_buff(unsigned char* buff, size_t size);
   CommImpl& set_dst_buff(unsigned char* buff, size_t* size);
@@ -52,7 +51,7 @@ public:
   void post() override;
   void finish() override;
 
-  CommImpl::Type type_; /* Type of the communication (SEND or RECEIVE) */
+  const Type type_ = Type::SEND; /* 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