X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1366b293e8c700b12567e45076cf0e6b7a25478f..b35b83061342281d4bfb1ef0b3e738dbcd0bee15:/src/msg/instr_msg_process.cpp diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp index 856923b245..11bbb18316 100644 --- a/src/msg/instr_msg_process.cpp +++ b/src/msg/instr_msg_process.cpp @@ -24,7 +24,7 @@ char *instr_process_id_2 (const char *process_name, int process_pid, char *str, /* * Instrumentation functions to trace MSG processes (msg_process_t) */ -void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, msg_host_t new_host) +void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host) { if (TRACE_msg_process_is_enabled()){ static long long int counter = 0; @@ -37,7 +37,7 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, m //start link container_t msg = PJ_container_get (instr_process_id(process, str, len)); - type_t type = PJ_type_get ("MSG_PROCESS_LINK", PJ_type_get_root()); + Type* type = PJ_type_get ("MSG_PROCESS_LINK", PJ_type_get_root()); new StartLinkEvent (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); //destroy existing container of this process @@ -87,15 +87,15 @@ void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t proc } void TRACE_msg_process_suspend(msg_process_t process) -{ paje_value pj_value; +{ if (TRACE_msg_process_is_enabled()){ int len = INSTR_DEFAULT_STR_SIZE; char str[INSTR_DEFAULT_STR_SIZE]; container_t process_container = PJ_container_get (instr_process_id(process, str, len)); - type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type); - val_t value = pj_value.PJ_value_get ("suspend", type); - new PushStateEvent (MSG_get_clock(), process_container, type, value); + Type* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type); + value* val = value::get("suspend", type); + new PushStateEvent(MSG_get_clock(), process_container, type, val); } } @@ -106,21 +106,21 @@ void TRACE_msg_process_resume(msg_process_t process) char str[INSTR_DEFAULT_STR_SIZE]; container_t process_container = PJ_container_get (instr_process_id(process, str, len)); - type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type); + Type* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type); new PopStateEvent (MSG_get_clock(), process_container, type); } } void TRACE_msg_process_sleep_in(msg_process_t process) -{ paje_value pj_value; +{ if (TRACE_msg_process_is_enabled()){ int len = INSTR_DEFAULT_STR_SIZE; char str[INSTR_DEFAULT_STR_SIZE]; container_t process_container = PJ_container_get (instr_process_id(process, str, len)); - type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type); - val_t value = pj_value.PJ_value_get ("sleep", type); - new PushStateEvent (MSG_get_clock(), process_container, type, value); + Type* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type); + value* val = value::get("sleep", type); + new PushStateEvent(MSG_get_clock(), process_container, type, val); } } @@ -131,7 +131,7 @@ void TRACE_msg_process_sleep_out(msg_process_t process) char str[INSTR_DEFAULT_STR_SIZE]; container_t process_container = PJ_container_get (instr_process_id(process, str, len)); - type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type); + Type* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type); new PopStateEvent (MSG_get_clock(), process_container, type); } }