X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f9c16dc1c877e21cf0a8c538e62f94dc66bce49..183a6118a95c570b0c66695505dab7dbebc0c7b3:/src/kernel/activity/CommImpl.hpp

diff --git a/src/kernel/activity/CommImpl.hpp b/src/kernel/activity/CommImpl.hpp
index d1e19492a5..bbf350c10e 100644
--- a/src/kernel/activity/CommImpl.hpp
+++ b/src/kernel/activity/CommImpl.hpp
@@ -1,31 +1,70 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2017. 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 SRC_KERNEL_ACTIVITY_COMMIMPL_HPP_
-#define SRC_KERNEL_ACTIVITY_COMMIMPL_HPP_
+#ifndef SIMIX_SYNCHRO_COMM_HPP
+#define SIMIX_SYNCHRO_COMM_HPP
 
-#include "simgrid/forward.h"
+#include "src/kernel/activity/ActivityImpl.hpp"
+#include "surf/surf.h"
 
-#include <atomic>
-#include <simgrid/simix.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 : ActivityImpl
+XBT_PUBLIC_CLASS CommImpl : public ActivityImpl
 {
+  ~CommImpl() override;
+
 public:
-  CommImpl() : piface_(this){};
-  ~CommImpl() = default;
+  explicit CommImpl(e_smx_comm_type_t type);
+  void suspend() override;
+  void resume() override;
+  void post() 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) */
+  smx_mailbox_t 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
+                                     (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*, 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;
 
-  using Ptr = boost::intrusive_ptr<ActivityImpl>;
-  simgrid::s4u::Comm piface_; // Our interface
+  /* 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;
+
+  /* Data to be transfered */
+  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;
 };
 }
 }
-}
+} // namespace simgrid::kernel::activity
 
-#endif /* SRC_KERNEL_ACTIVITY_COMMIMPL_HPP_ */
+#endif