X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/900387d3c17ad331e7ce770590d07aca4be07c1d..2fe56becb7b12edd78788a83dbc1d3e1d85d9dbc:/include/simgrid/s4u/comm.hpp

diff --git a/include/simgrid/s4u/comm.hpp b/include/simgrid/s4u/comm.hpp
index fa6b0648e0..2929750de8 100644
--- a/include/simgrid/s4u/comm.hpp
+++ b/include/simgrid/s4u/comm.hpp
@@ -8,8 +8,9 @@
 #define SIMGRID_S4U_COMM_HPP
 
 #include <xbt/base.h>
+
+#include <simgrid/s4u/Activity.hpp>
 #include <simgrid/s4u/forward.hpp>
-#include <simgrid/s4u/async.hpp>
 #include <simgrid/s4u/mailbox.hpp>
 
 namespace simgrid {
@@ -19,62 +20,61 @@ namespace s4u {
  *
  * Represents all asynchronous communications, that you can test or wait onto.
  */
-XBT_PUBLIC_CLASS Comm : public Async {
-	Comm() : Async() {}
+XBT_PUBLIC_CLASS Comm : public Activity {
+  Comm() : Activity() {}
 public:
-	virtual ~Comm();
+  ~Comm() override;
 
 public:
-	/** Creates (but don't start) an async send to the mailbox #dest */
-	static Comm &send_init(Actor *sender, Mailbox &dest);
-	/** Creates and start an async send to the mailbox #dest */
-	static Comm &send_async(s4u::Actor *sender, Mailbox &dest, void *data, int simulatedByteAmount);
-    /** Creates (but don't start) an async recv onto the mailbox #from */
-	static Comm &recv_init(s4u::Actor *receiver, Mailbox &from);
-	/** Creates and start an async recv to the mailbox #from */
-	static Comm &recv_async(s4u::Actor *receiver, Mailbox &from, void **data);
-
-	void start() override;
-	void wait() override;
-	void wait(double timeout) override;
+  /** Creates (but don't start) an async send to the mailbox @p dest */
+  static Comm &send_init(Mailbox &dest);
+  /** Creates and start an async send to the mailbox @p dest */
+  static Comm &send_async(Mailbox &dest, void *data, int simulatedByteAmount);
+    /** Creates (but don't start) an async recv onto the mailbox @p from */
+  static Comm &recv_init(Mailbox &from);
+  /** Creates and start an async recv to the mailbox @p from */
+  static Comm &recv_async(Mailbox &from, void **data);
 
-private:
-	double p_rate=-1;
-public:
-	/** Sets the maximal communication rate (in byte/sec). Must be done before start */
-	void setRate(double rate);
+  void start() override;
+  void wait() override;
+  void wait(double timeout) override;
+
+  /** Sets the maximal communication rate (in byte/sec). Must be done before start */
+  void setRate(double rate);
+
+  /** Specify the data to send */
+  void setSrcData(void * buff);
+  /** Specify the size of the data to send */
+  void setSrcDataSize(size_t size);
+  /** Specify the data to send and its size */
+  void setSrcData(void * buff, size_t size);
+
+  /** Specify where to receive the data */
+  void setDstData(void ** buff);
+  /** Specify the buffer in which the data should be received */
+  void setDstData(void ** buff, size_t size);
+  /** Retrieve the size of the received data */
+  size_t getDstDataSize();
+
+  bool test();
 
-private:
-	void *p_dstBuff = NULL;
-	size_t p_dstBuffSize = 0;
-	void *p_srcBuff = NULL;
-	size_t p_srcBuffSize = sizeof(void*);
-public:
-	/** Specify the data to send */
-	void setSrcData(void * buff);
-	/** Specify the size of the data to send */
-	void setSrcDataSize(size_t size);
-	/** Specify the data to send and its size */
-	void setSrcData(void * buff, size_t size);
-
-	/** Specify where to receive the data */
-	void setDstData(void ** buff);
-	/** Specify the buffer in which the data should be received */
-	void setDstData(void ** buff, size_t size);
-	/** Retrieve the size of the received data */
-	size_t getDstDataSize();
-
-
-private: /* FIXME: expose these elements in the API */
-	int p_detached = 0;
-    int (*p_matchFunction)(void *, void *, smx_synchro_t) = NULL;
-    void (*p_cleanFunction)(void *) = NULL;
-    void (*p_copyDataFunction)(smx_synchro_t, void*, size_t) = NULL;
 
 private:
-	Actor *p_sender = NULL;
-	Actor *p_receiver = NULL;
-	Mailbox *p_mailbox = NULL;
+  double rate_ = -1;
+  void *dstBuff_ = nullptr;
+  size_t dstBuffSize_ = 0;
+  void *srcBuff_ = nullptr;
+  size_t srcBuffSize_ = sizeof(void*);
+
+  /* FIXME: expose these elements in the API */
+  int detached_ = 0;
+  int (*matchFunction_)(void *, void *, smx_synchro_t) = nullptr;
+  void (*cleanFunction_)(void *) = nullptr;
+  void (*copyDataFunction_)(smx_synchro_t, void*, size_t) = nullptr;
+
+  smx_process_t sender_ = nullptr;
+  smx_process_t receiver_ = nullptr;
+  Mailbox *mailbox_ = nullptr;
 };
 
 }} // namespace simgrid::s4u