X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bae076147bfc88ce8607f15761149f42d0443585..1242154344890b641971b49954a6cd0d49fe037b:/src/msg/msg_private.h diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index 01bbea57a8..8327148aa3 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -9,21 +9,19 @@ #include "simgrid/msg.h" #include "simgrid/simix.h" -#include "surf/surf.h" +#include "src/include/surf/surf.h" #include "xbt/base.h" #include "xbt/fifo.h" #include "xbt/dynar.h" #include "xbt/swag.h" #include "xbt/dict.h" #include "xbt/config.h" -#include "instr/instr_private.h" +#include "src/instr/instr_private.h" SG_BEGIN_DECL() /**************** datatypes **********************************/ /********************************* Task **************************************/ - - #define MSG_BT(ptr, m) \ do {xbt_ex_t *_xbt_ex_t = xbt_new0(xbt_ex_t, 1); \ /* build the exception */ \ @@ -34,7 +32,7 @@ SG_BEGIN_DECL() _xbt_ex_t->pid = xbt_getpid(); \ _xbt_ex_t->file = (char*)__FILE__; \ _xbt_ex_t->line = __LINE__; \ - _xbt_ex_t->func = (char*)_XBT_FUNCTION; \ + _xbt_ex_t->func = (char*)__func__; \ _xbt_ex_t->bt_strings = NULL; \ xbt_backtrace_current(_xbt_ex_t); \ ptr = _xbt_ex_t; } while(0) @@ -84,9 +82,6 @@ typedef struct simdata_gpu_task { typedef struct simdata_process { msg_host_t m_host; /* the host on which the process is running */ msg_host_t put_host; /* used for debugging purposes */ -#ifdef MSG_USE_DEPRECATED - m_channel_t put_channel; /* used for debugging purposes */ -#endif smx_synchro_t waiting_action; msg_task_t waiting_task; char **argv; /* arguments table if any */ @@ -113,7 +108,6 @@ typedef struct msg_comm { msg_error_t status; /* status of the communication once finished */ } s_msg_comm_t; - /******************************* VM *************************************/ typedef struct dirty_page { double prev_clock; @@ -130,9 +124,6 @@ XBT_PUBLIC_DATA(const char*) MSG_vm_get_name(msg_vm_t vm); /************************** Global variables ********************************/ typedef struct MSG_Global { xbt_fifo_t host; -#ifdef MSG_USE_DEPRECATED - int max_channel; -#endif int session; int debug_multiple_use; unsigned long int sent_msg; /* Total amount of messages sent during the simulation */ @@ -143,24 +134,12 @@ typedef struct MSG_Global { /*extern MSG_Global_t msg_global;*/ XBT_PUBLIC_DATA(MSG_Global_t) msg_global; - /*************************************************************/ - -#ifdef MSG_USE_DEPRECATED -# define PROCESS_SET_ERRNO(val) \ - (((simdata_process_t) SIMIX_process_self_get_data(SIMIX_process_self()))->last_errno=val) -# define PROCESS_GET_ERRNO() \ - (((simdata_process_t) SIMIX_process_self_get_data(SIMIX_process_self()))->last_errno) -#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.") */ - -#else +// FIXME: KILLME # define MSG_RETURN(val) return(val) -#endif XBT_PRIVATE msg_host_t __MSG_host_create(sg_host_t host); XBT_PRIVATE msg_storage_t __MSG_storage_create(smx_storage_t storage); -void __MSG_host_destroy(msg_host_t host); XBT_PRIVATE void __MSG_host_priv_free(msg_host_priv_t priv); XBT_PRIVATE void __MSG_storage_destroy(msg_storage_priv_t host); XBT_PRIVATE void __MSG_file_destroy(msg_file_priv_t host); @@ -178,6 +157,11 @@ XBT_PRIVATE void MSG_post_create_environment(void); XBT_PRIVATE void MSG_host_add_task(msg_host_t host, msg_task_t task); XBT_PRIVATE void MSG_host_del_task(msg_host_t host, msg_task_t task); +/* @brief MSG_mailbox_free - release a mailbox from the memory. + * Releases a mailbox from the memory but does not remove it from the dictionary. + * @param mailbox The mailbox to release. + */ +XBT_PRIVATE void MSG_mailbox_free(void *mailbox); /********** Tracing **********/ /* declaration of instrumentation functions from msg_task_instr.c */ @@ -194,22 +178,19 @@ XBT_PRIVATE void TRACE_msg_task_put_end(void); /* declaration of instrumentation functions from msg_process_instr.c */ XBT_PRIVATE char *instr_process_id (msg_process_t proc, char *str, int len); XBT_PRIVATE char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len); -XBT_PRIVATE void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, - msg_host_t new_host); +XBT_PRIVATE void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, msg_host_t new_host); XBT_PRIVATE void TRACE_msg_process_create (const char *process_name, int process_pid, msg_host_t host); -XBT_PRIVATE void TRACE_msg_process_destroy (const char *process_name, int process_pid, msg_host_t host); +XBT_PRIVATE void TRACE_msg_process_destroy (const char *process_name, int process_pid); XBT_PRIVATE void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t process); XBT_PRIVATE void TRACE_msg_process_suspend(msg_process_t process); XBT_PRIVATE void TRACE_msg_process_resume(msg_process_t process); XBT_PRIVATE void TRACE_msg_process_sleep_in(msg_process_t process); //called from msg/gos.c XBT_PRIVATE void TRACE_msg_process_sleep_out(msg_process_t process); -XBT_PRIVATE void TRACE_msg_process_end(msg_process_t process); /* declaration of instrumentation functions from instr_msg_vm.c */ XBT_PRIVATE char *instr_vm_id(msg_vm_t vm, char *str, int len); XBT_PRIVATE char *instr_vm_id_2(const char *vm_name, char *str, int len); -XBT_PRIVATE void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host, - msg_host_t new_host); +XBT_PRIVATE void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host, msg_host_t new_host); XBT_PRIVATE void TRACE_msg_vm_start(msg_vm_t vm); XBT_PRIVATE void TRACE_msg_vm_create(const char *vm_name, msg_host_t host); XBT_PRIVATE void TRACE_msg_vm_kill(msg_vm_t process);