X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/be0496d96433c281ac28197b5e2a208245ee4a91..5b9cf50be0a43c599b20b1ed28341971a571d70d:/src/msg/private.h diff --git a/src/msg/private.h b/src/msg/private.h index 210c17307b..ea7e5190d2 100644 --- a/src/msg/private.h +++ b/src/msg/private.h @@ -8,6 +8,7 @@ #ifndef METASIMGRID_PRIVATE_H #define METASIMGRID_PRIVATE_H +#include #include "msg/msg.h" #include "surf/surf.h" #include "xbt/fifo.h" @@ -95,8 +96,8 @@ typedef struct MSG_Global { extern MSG_Global_t msg_global; /************************** Configuration support ********************************/ -XBT_PUBLIC void msg_config_init(void); /* create the config set, call this before use! */ -XBT_PUBLIC void msg_config_finalize(void); /* destroy the config set, call this at cleanup. */ +void msg_config_init(void); /* create the config set, call this before use! */ +void msg_config_finalize(void); /* destroy the config set, call this at cleanup. */ extern int _msg_init_status; /* 0: beginning of time; 1: pre-inited (cfg_set created); 2: inited (running) */ @@ -113,22 +114,22 @@ extern xbt_cfg_t _msg_cfg_set; get_state(MSG_host_self()->simdata->host)==SURF_CPU_ON,\ "Host failed, you cannot call this function.") -XBT_PUBLIC m_host_t __MSG_host_create(const char *name, void *workstation, +m_host_t __MSG_host_create(const char *name, void *workstation, void *data); -XBT_PUBLIC void __MSG_host_destroy(m_host_t host); -XBT_PUBLIC void __MSG_task_execute(m_process_t process, m_task_t task); -XBT_PUBLIC MSG_error_t __MSG_wait_for_computation(m_process_t process, m_task_t task); -XBT_PUBLIC MSG_error_t __MSG_task_wait_event(m_process_t process, m_task_t task); +void __MSG_host_destroy(m_host_t host); +void __MSG_task_execute(m_process_t process, m_task_t task); +MSG_error_t __MSG_wait_for_computation(m_process_t process, m_task_t task); +MSG_error_t __MSG_task_wait_event(m_process_t process, m_task_t task); -XBT_PUBLIC int __MSG_process_block(double max_duration, const char *info); -XBT_PUBLIC MSG_error_t __MSG_process_unblock(m_process_t process); -XBT_PUBLIC int __MSG_process_isBlocked(m_process_t process); +int __MSG_process_block(double max_duration, const char *info); +MSG_error_t __MSG_process_unblock(m_process_t process); +int __MSG_process_isBlocked(m_process_t process); -XBT_PUBLIC void __MSG_display_process_status(void); +void __MSG_display_process_status(void); -XBT_PUBLIC m_task_t task_mallocator_new_f(void); -XBT_PUBLIC void task_mallocator_free_f(m_task_t task); -XBT_PUBLIC void task_mallocator_reset_f(m_task_t task); +m_task_t task_mallocator_new_f(void); +void task_mallocator_free_f(m_task_t task); +void task_mallocator_reset_f(m_task_t task); @@ -139,7 +140,7 @@ XBT_PUBLIC void task_mallocator_reset_f(m_task_t task); #define PAJE_PROCESS_PUSH_STATE(process,state,task)\ if(msg_global->paje_output) \ fprintf(msg_global->paje_output,"11 %f S_t %p %s \"%s\"\n",\ - surf_get_clock(), (process),(state),(task)?((m_task_t)(task))->name:"") + surf_get_clock(), (process),(state),(task)?((m_task_t)(task))->name:" ") #define PAJE_PROCESS_POP_STATE(process)\ if(msg_global->paje_output) \ fprintf(msg_global->paje_output,"12 %f S_t %p\n",\