#define SIMGRID_KERNEL_ACTIVITY_COMM_HPP
#include "src/kernel/activity/ActivityImpl.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/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 {
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) */
- 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 */
void (*clean_fun)(void*) = nullptr; /* Function to clean the detached src_buf if something goes wrong */
- int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*) =
- nullptr; /* Filter function used by the other side. It is used when
+ 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)(smx_activity_t, void*, size_t) = nullptr;
+ void (*copy_data_fun)(CommImpl*, void*, size_t) = nullptr;
/* Surf action data */
resource::Action* surf_action_ = nullptr; /* The Surf communication action encapsulated */
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