#define METASIMGRID_PRIVATE_H
#include "msg/msg.h"
-#include "simix/simix.h"
+#include "simgrid/simix.h"
#include "surf/surf.h"
#include "xbt/fifo.h"
#include "xbt/dynar.h"
SG_BEGIN_DECL()
/**************** datatypes **********************************/
-typedef struct simdata_host {
- smx_host_t smx_host; /* SURF modeling */
- msg_mailbox_t *mailboxes; /* mailboxes to store msg tasks of of the host */
-} s_simdata_host_t;
/********************************* Task **************************************/
double *comm_amount;
} s_simdata_task_t;
+/********************************* File **************************************/
+typedef struct simdata_file {
+ smx_file_t smx_file;
+} s_simdata_file_t;
/*************** Begin GPU ***************/
typedef struct simdata_gpu_task {
# define MSG_RETURN(val) return(val)
#endif
-m_host_t __MSG_host_create(smx_host_t workstation, void *data);
+m_host_t __MSG_host_create(smx_host_t workstation);
void __MSG_host_destroy(m_host_t host);
void __MSG_display_process_status(void);
void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc);
void MSG_process_create_from_SIMIX(smx_process_t *process, const char *name,
xbt_main_func_t code, void *data,
- const char *hostname, int argc,
+ const char *hostname, double kill_time, int argc,
char **argv, xbt_dict_t properties);
void MSG_process_kill_from_SIMIX(smx_process_t p);
void MSG_comm_copy_data_from_SIMIX(smx_action_t comm, void* buff, size_t buff_size);