X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/364eee0fc6ab77fddc5437ac273527bd27711724..3cbf54871089cc3dc50b6832652b5765e1601039:/src/msg/msg_private.hpp diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp index 094dd62f4e..78865143ee 100644 --- a/src/msg/msg_private.hpp +++ b/src/msg/msg_private.hpp @@ -15,16 +15,6 @@ #include /**************** datatypes **********************************/ -/**************************** Host Extension *********************************/ -namespace simgrid { -class MsgHostExt { -public: - static simgrid::xbt::Extension EXTENSION_ID; - - ~MsgHostExt() { delete file_descriptor_table; } - std::vector* file_descriptor_table = nullptr; // Created lazily on need -}; -} /********************************* Task **************************************/ struct s_simdata_task_t { @@ -96,7 +86,7 @@ typedef s_MSG_Global_t* MSG_Global_t; extern "C" { -XBT_PUBLIC_DATA(MSG_Global_t) msg_global; +XBT_PUBLIC_DATA MSG_Global_t msg_global; /*************************************************************/ XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc); @@ -105,9 +95,6 @@ XBT_PRIVATE smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::fun smx_actor_t parent_process); XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(smx_activity_t comm, void* buff, size_t buff_size); -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); - /********** Tracing **********/ /* declaration of instrumentation functions from msg_task_instr.c */ XBT_PRIVATE void TRACE_msg_set_task_category(msg_task_t task, const char* category); @@ -115,31 +102,19 @@ XBT_PRIVATE void TRACE_msg_task_create(msg_task_t task); XBT_PRIVATE void TRACE_msg_task_execute_start(msg_task_t task); XBT_PRIVATE void TRACE_msg_task_execute_end(msg_task_t task); XBT_PRIVATE void TRACE_msg_task_destroy(msg_task_t task); -XBT_PRIVATE void TRACE_msg_task_get_end(double start_time, msg_task_t task); +XBT_PRIVATE void TRACE_msg_task_get_end(msg_task_t task); XBT_PRIVATE void TRACE_msg_task_get_start(); -XBT_PRIVATE int TRACE_msg_task_put_start(msg_task_t task); // returns TRUE if the task_put_end must be called +XBT_PRIVATE void TRACE_msg_task_put_start(msg_task_t task); XBT_PRIVATE void TRACE_msg_task_put_end(); /* 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 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); 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); } inline void s_simdata_task_t::setUsed() { if (this->isused) this->reportMultipleUse(); - if (msg_global->debug_multiple_use) { - // TODO, backtrace - } this->isused = true; }