X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae855a0d996d06d373fbc233e78b0fbe7f1f2df6..9a7c6c8f75db930814b5ca356795f8ff2347c5d7:/src/msg/private.h diff --git a/src/msg/private.h b/src/msg/private.h index 6c6f6e81df..a6e91942f4 100644 --- a/src/msg/private.h +++ b/src/msg/private.h @@ -37,7 +37,7 @@ typedef struct simdata_task { m_host_t source; double priority; double rate; - int refcount; + int isused; /* Indicates whether the task is used in SIMIX currently */ int host_nb; /* ==0 if sequential task; parallel task if not */ /******* Parallel Tasks Only !!!! *******/ smx_host_t *host_list; @@ -92,8 +92,10 @@ 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_assert1(SIMIX_req_host_get_state(SIMIX_host_self())==1,\ - "Host failed, you cannot call this function. (state=%d)",SIMIX_req_host_get_state(SIMIX_host_self())) +/*#define CHECK_HOST() xbt_assert1(SIMIX_req_host_get_state(SIMIX_host_self())==1,\ + "Host failed, you cannot call this function. (state=%d)",SIMIX_req_host_get_state(SIMIX_host_self()))*/ +#define CHECK_HOST() + m_host_t __MSG_host_create(smx_host_t workstation, void *data); @@ -102,10 +104,10 @@ void __MSG_host_destroy(m_host_t host); void __MSG_display_process_status(void); void __MSG_process_cleanup(smx_process_t smx_proc); -void *_MSG_process_create_from_SIMIX(const char *name, - xbt_main_func_t code, void *data, - char *hostname, int argc, - char **argv, xbt_dict_t properties); +void _MSG_process_create_from_SIMIX(void *process, const char *name, + xbt_main_func_t code, void *data, + char *hostname, int argc, + char **argv, xbt_dict_t properties); void _MSG_process_kill_from_SIMIX(void *p); void _MSG_action_init(void);