Use CommImpl* for comm_copy callbacks.

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

diff --git a/src/kernel/activity/CommImpl.hpp b/src/kernel/activity/CommImpl.hpp
index 5582830..9595782 100644 (file)
--- a/src/kernel/activity/CommImpl.hpp
+++ b/src/kernel/activity/CommImpl.hpp
@@ -10,7 +10,6 @@
 #include "src/simix/ActorImpl.hpp"
 #include "surf/surf.hpp"
 
-enum e_smx_comm_type_t { SIMIX_COMM_SEND, SIMIX_COMM_RECEIVE, SIMIX_COMM_READY, SIMIX_COMM_DONE };
 
 namespace simgrid {
 namespace kernel {
@@ -18,17 +17,22 @@ namespace activity {
 
 class XBT_PUBLIC CommImpl : public ActivityImpl {
   ~CommImpl() override;
+  void cleanupSurf();
 
 public:
-  explicit CommImpl(e_smx_comm_type_t type);
+  enum class Type { SEND = 0, RECEIVE, READY, DONE };
+
+  explicit CommImpl(Type type);
+  void start();
+  void copy_data();
   void suspend() override;
   void resume() override;
   void post() override;
+  void finish() override;
   void cancel();
   double remains();
-  void cleanupSurf(); // FIXME: make me protected
 
-  e_smx_comm_type_t type;       /* Type of the communication (SIMIX_COMM_SEND or SIMIX_COMM_RECEIVE) */
+  CommImpl::Type type;          /* Type of the communication (SIMIX_COMM_SEND or SIMIX_COMM_RECEIVE) */
   smx_mailbox_t mbox = nullptr; /* Rendez-vous where the comm is queued */
 
 #if SIMGRID_HAVE_MC
@@ -43,7 +47,7 @@ public:
       nullptr; /* Filter function used by the other side. It is used when
 looking if a given communication matches my needs. For that, myself must match the
 expectations of the other side, too. See  */
-  void (*copy_data_fun)(smx_activity_t, void*, size_t) = nullptr;
+  void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t) = nullptr;
 
   /* Surf action data */
   resource::Action* surf_action_ = nullptr; /* The Surf communication action encapsulated */