#define _SIMIX_SYNCHRO_COMM_HPP
#include "surf/surf.h"
-#include "src/kernel/activity/Synchro.h"
+#include "src/kernel/activity/ActivityImpl.hpp"
typedef enum {
SIMIX_COMM_SEND,
} e_smx_comm_type_t;
namespace simgrid {
-namespace simix {
+namespace kernel {
+namespace activity {
- XBT_PUBLIC_CLASS Comm : public Synchro {
+ XBT_PUBLIC_CLASS Comm : public ActivityImpl {
~Comm() override;
public:
explicit Comm(e_smx_comm_type_t type);
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_synchro_t) = nullptr; /* Filter function used by the other side. It is used when
+ 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_synchro_t, void*, size_t) =nullptr;
+ void (*copy_data_fun) (smx_activity_t, 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_process_t src_proc = nullptr;
- smx_process_t dst_proc = nullptr;
+ smx_actor_t src_proc = nullptr;
+ smx_actor_t dst_proc = nullptr;
double rate = 0.0;
double task_size = 0.0;
void* dst_data = nullptr;
};
-}} // namespace simgrid::simix
+}}} // namespace simgrid::kernel::activity
#endif