X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0c3701e24626a87cef600fc29484a4e4b82e28be..15732d4548158986da572035d2e53a97c618e56b:/src/msg/msg_private.h diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index 3934c2c213..9c8fa72c39 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -8,7 +8,7 @@ #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" @@ -45,6 +45,10 @@ typedef struct simdata_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 { @@ -117,14 +121,11 @@ XBT_PUBLIC_DATA(MSG_Global_t) msg_global; #define MSG_RETURN(val) do {PROCESS_SET_ERRNO(val);return(val);} while(0) /* #define CHECK_ERRNO() ASSERT((PROCESS_GET_ERRNO()!=MSG_HOST_FAILURE),"Host failed, you cannot call this function.") */ -/*#define CHECK_HOST() xbt_assert(simcall_host_get_state(SIMIX_host_self())==1,\ - "Host failed, you cannot call this function. (state=%d)",simcall_host_get_state(SIMIX_host_self()))*/ #else # define MSG_RETURN(val) return(val) #endif -#define CHECK_HOST() -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);