[s4u] Removes unused simgrid::s4u::Host::hosts static variable

[simgrid.git] / include / simgrid / s4u / comm.hpp

diff --git a/include/simgrid/s4u/comm.hpp b/include/simgrid/s4u/comm.hpp
index f8cfd8f..fa6b064 100644 (file)
--- a/include/simgrid/s4u/comm.hpp
+++ b/include/simgrid/s4u/comm.hpp
@@ -7,19 +7,19 @@
 #ifndef SIMGRID_S4U_COMM_HPP
 #define SIMGRID_S4U_COMM_HPP
 
-#include "simgrid/s4u/async.hpp"
-#include "simgrid/s4u/mailbox.hpp"
+#include <xbt/base.h>
+#include <simgrid/s4u/forward.hpp>
+#include <simgrid/s4u/async.hpp>
+#include <simgrid/s4u/mailbox.hpp>
 
 namespace simgrid {
 namespace s4u {
 
-class Mailbox;
-
 /** @brief Communication async
  *
  * Represents all asynchronous communications, that you can test or wait onto.
  */
-class Comm : public Async {
+XBT_PUBLIC_CLASS Comm : public Async {
        Comm() : Async() {}
 public:
        virtual ~Comm();
@@ -30,9 +30,9 @@ public:
        /** 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(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(Mailbox &from, void *data);
+       static Comm &recv_async(s4u::Actor *receiver, Mailbox &from, void **data);
 
        void start() override;
        void wait() override;
@@ -45,6 +45,8 @@ public:
        void setRate(double rate);
 
 private:
+       void *p_dstBuff = NULL;
+       size_t p_dstBuffSize = 0;
        void *p_srcBuff = NULL;
        size_t p_srcBuffSize = sizeof(void*);
 public:
@@ -55,17 +57,23 @@ public:
        /** 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;
 };