X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1e83888c1aed0b9146b5ae78ad474f374d28a769..f8498e93073ae2ad6e6e19571ecf52c9104edbd0:/src/kernel/activity/CommImpl.hpp

diff --git a/src/kernel/activity/CommImpl.hpp b/src/kernel/activity/CommImpl.hpp
index bbf350c10e..777d826547 100644
--- a/src/kernel/activity/CommImpl.hpp
+++ b/src/kernel/activity/CommImpl.hpp
@@ -1,70 +1,80 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef SIMIX_SYNCHRO_COMM_HPP
-#define SIMIX_SYNCHRO_COMM_HPP
+#ifndef SIMGRID_KERNEL_ACTIVITY_COMM_HPP
+#define SIMGRID_KERNEL_ACTIVITY_COMM_HPP
 
 #include "src/kernel/activity/ActivityImpl.hpp"
-#include "surf/surf.h"
+#include "src/kernel/actor/ActorImpl.hpp"
+#include "surf/surf.hpp"
 
-typedef enum { SIMIX_COMM_SEND, SIMIX_COMM_RECEIVE, SIMIX_COMM_READY, SIMIX_COMM_DONE } e_smx_comm_type_t;
 
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
-XBT_PUBLIC_CLASS CommImpl : public ActivityImpl
-{
+class XBT_PUBLIC CommImpl : public ActivityImpl_T<CommImpl> {
   ~CommImpl() override;
+  void cleanupSurf();
+
+  double rate_ = 0.0;
+  double size_ = 0.0;
 
 public:
-  explicit CommImpl(e_smx_comm_type_t type);
+  enum class Type { SEND = 0, RECEIVE, READY, DONE };
+
+  CommImpl& set_type(CommImpl::Type type);
+  CommImpl& set_size(double size);
+  CommImpl& set_src_buff(void* buff, size_t size);
+  CommImpl& set_dst_buff(void* buff, size_t* size);
+  CommImpl& set_rate(double rate);
+  double get_rate() { return rate_; }
+
+  void copy_data();
+
+  CommImpl* start();
   void suspend() override;
   void resume() override;
+  void cancel() override;
   void post() override;
-  void cancel();
-  double remains();
-  void cleanupSurf(); // FIXME: make me protected
+  void finish() override;
 
-  e_smx_comm_type_t type;       /* Type of the communication (SIMIX_COMM_SEND or SIMIX_COMM_RECEIVE) */
-  smx_mailbox_t mbox = nullptr; /* Rendez-vous where the comm is queued */
+  CommImpl::Type type_;        /* Type of the communication (SIMIX_COMM_SEND or SIMIX_COMM_RECEIVE) */
+  MailboxImpl* mbox = nullptr; /* Rendez-vous where the comm is queued */
 
 #if SIMGRID_HAVE_MC
-  smx_mailbox_t mbox_cpy = nullptr; /* Copy of the rendez-vous where the comm is queued, MC needs it for DPOR
+  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 */
+  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*, smx_activity_t) = 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;
+  int (*match_fun)(void*, void*, CommImpl*) = 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)(CommImpl*, void*, size_t) = nullptr;
 
   /* Surf action data */
-  surf_action_t surf_comm   = nullptr; /* The Surf communication action encapsulated */
-  surf_action_t src_timeout = nullptr; /* Surf's actions to instrument the timeouts */
-  surf_action_t dst_timeout = nullptr; /* Surf's actions to instrument the timeouts */
-  smx_actor_t src_proc      = nullptr;
-  smx_actor_t dst_proc      = nullptr;
-  double rate               = 0.0;
-  double task_size          = 0.0;
+  resource::Action* src_timeout_ = nullptr; /* Surf's actions to instrument the timeouts */
+  resource::Action* dst_timeout_ = nullptr; /* Surf's actions to instrument the timeouts */
+  actor::ActorImplPtr src_actor_ = nullptr;
+  actor::ActorImplPtr dst_actor_ = nullptr;
 
   /* Data to be transfered */
-  void* src_buff        = nullptr;
-  void* dst_buff        = nullptr;
-  size_t src_buff_size  = 0;
-  size_t* dst_buff_size = nullptr;
+  void* src_buff_        = nullptr;
+  void* 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 communication */
-  void* dst_data = nullptr;
+  void* src_data_ = nullptr; /* User data associated to the communication */
+  void* dst_data_ = nullptr;
 };
-}
-}
-} // namespace simgrid::kernel::activity
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid
 
 #endif