#include "simgrid/msg.h"
-#include "src/kernel/activity/SynchroExec.hpp"
-#include "src/kernel/activity/SynchroComm.hpp"
-
-#include <xbt/Extendable.hpp>
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/activity/ExecImpl.hpp"
+#include "xbt/Extendable.hpp"
/**************** datatypes **********************************/
/**************************** Host Extension *********************************/
this->isused = false;
}
- simgrid::kernel::activity::Exec *compute = nullptr; /* SIMIX modeling of computation */
- simgrid::kernel::activity::Comm *comm = nullptr; /* SIMIX modeling of communication */
+ simgrid::kernel::activity::ExecImpl* compute = nullptr; /* SIMIX modeling of computation */
+ simgrid::kernel::activity::CommImpl* comm = nullptr; /* SIMIX modeling of communication */
double bytes_amount = 0.0; /* Data size */
double flops_amount = 0.0; /* Computation size */
msg_process_t sender = nullptr;
};
}
-typedef struct process_arg {
- const char *name;
- xbt_main_func_t code;
- void *data;
- msg_host_t m_host;
- int argc;
- char **argv;
- double kill_time;
-} s_process_arg_t, *process_arg_t;
-
typedef struct msg_comm {
smx_activity_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */
msg_task_t task_sent; /* task sent (NULL for the receiver) */
unsigned long int sent_msg; /* Total amount of messages sent during the simulation */
void (*task_copy_callback) (msg_task_t task, msg_process_t src, msg_process_t dst);
void_f_pvoid_t process_data_cleanup;
-} s_MSG_Global_t, *MSG_Global_t;
+} s_MSG_Global_t;
+typedef s_MSG_Global_t* MSG_Global_t;
SG_BEGIN_DECL()
XBT_PRIVATE msg_host_t __MSG_host_create(sg_host_t host);
XBT_PRIVATE msg_storage_t __MSG_storage_create(smx_storage_t storage);
XBT_PRIVATE void __MSG_storage_destroy(msg_storage_priv_t host);
-XBT_PRIVATE void __MSG_file_destroy(msg_file_priv_t host);
+XBT_PRIVATE void __MSG_file_destroy(msg_file_t file);
XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc);
XBT_PRIVATE smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::function<void()> code, void* data,