From a0befebbc9f2e100b91f70a99e330aeddcde6e11 Mon Sep 17 00:00:00 2001 From: Takishipp Date: Fri, 21 Apr 2017 17:19:42 +0200 Subject: [PATCH 1/1] save work --- src/msg/instr_msg_process.cpp | 12 ++++++------ src/msg/instr_msg_task.cpp | 16 ++++++++-------- src/msg/msg_vm.cpp | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp index 8bb5b20cce..263983422e 100644 --- a/src/msg/instr_msg_process.cpp +++ b/src/msg/instr_msg_process.cpp @@ -38,7 +38,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()); - new_pajeStartLink (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); + StartLinkEvent (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); //destroy existing container of this process TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (process)); @@ -49,7 +49,7 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, m //end link msg = PJ_container_get(instr_process_id(process, str, len)); type = PJ_type_get ("MSG_PROCESS_LINK", PJ_type_get_root()); - new_pajeEndLink (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); + EndLinkEvent (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); } } @@ -95,7 +95,7 @@ void TRACE_msg_process_suspend(msg_process_t process) 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_get ("suspend", type); - new_pajePushState (MSG_get_clock(), process_container, type, value); + PushStateEvent (MSG_get_clock(), process_container, type, value); } } @@ -107,7 +107,7 @@ void TRACE_msg_process_resume(msg_process_t process) 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); - new_pajePopState (MSG_get_clock(), process_container, type); + PopStateEvent (MSG_get_clock(), process_container, type); } } @@ -120,7 +120,7 @@ void TRACE_msg_process_sleep_in(msg_process_t process) 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_get ("sleep", type); - new_pajePushState (MSG_get_clock(), process_container, type, value); + PushStateEvent (MSG_get_clock(), process_container, type, value); } } @@ -132,6 +132,6 @@ void TRACE_msg_process_sleep_out(msg_process_t process) 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); - new_pajePopState (MSG_get_clock(), process_container, type); + PopStateEvent (MSG_get_clock(), process_container, type); } } diff --git a/src/msg/instr_msg_task.cpp b/src/msg/instr_msg_task.cpp index 65f32a6d66..6c42c1266b 100644 --- a/src/msg/instr_msg_task.cpp +++ b/src/msg/instr_msg_task.cpp @@ -53,7 +53,7 @@ void TRACE_msg_task_execute_start(msg_task_t task) container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len)); type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type); val_t value = PJ_value_get ("task_execute", type); - new_pajePushState (MSG_get_clock(), process_container, type, value); + PushStateEvent (MSG_get_clock(), process_container, type, value); } } @@ -67,7 +67,7 @@ void TRACE_msg_task_execute_end(msg_task_t task) container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len)); type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type); - new_pajePopState (MSG_get_clock(), process_container, type); + PopStateEvent (MSG_get_clock(), process_container, type); } } @@ -93,7 +93,7 @@ void TRACE_msg_task_get_start() container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len)); type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type); val_t value = PJ_value_get ("receive", type); - new_pajePushState (MSG_get_clock(), process_container, type, value); + PushStateEvent (MSG_get_clock(), process_container, type, value); } } @@ -107,12 +107,12 @@ void TRACE_msg_task_get_end(double start_time, msg_task_t task) container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len)); type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type); - new_pajePopState (MSG_get_clock(), process_container, type); + PopStateEvent (MSG_get_clock(), process_container, type); char key[INSTR_DEFAULT_STR_SIZE]; snprintf (key, INSTR_DEFAULT_STR_SIZE, "p%lld", task->counter); type = PJ_type_get ("MSG_PROCESS_TASK_LINK", PJ_type_get_root()); - new_pajeEndLink(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key); + EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key); } } @@ -128,12 +128,12 @@ int TRACE_msg_task_put_start(msg_task_t task) container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len)); type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type); val_t value = PJ_value_get ("send", type); - new_pajePushState (MSG_get_clock(), process_container, type, value); + PushStateEvent (MSG_get_clock(), process_container, type, value); char key[INSTR_DEFAULT_STR_SIZE]; snprintf (key, INSTR_DEFAULT_STR_SIZE, "p%lld", task->counter); type = PJ_type_get ("MSG_PROCESS_TASK_LINK", PJ_type_get_root()); - new_pajeStartLink(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key); + StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key); } return 1; @@ -149,6 +149,6 @@ void TRACE_msg_task_put_end() container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len)); type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type); - new_pajePopState (MSG_get_clock(), process_container, type); + PopStateEvent (MSG_get_clock(), process_container, type); } } diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp index c08b2c733e..95718a4902 100644 --- a/src/msg/msg_vm.cpp +++ b/src/msg/msg_vm.cpp @@ -207,7 +207,7 @@ void MSG_vm_start(msg_vm_t vm) container_t vm_container = PJ_container_get(vm->cname()); type_t type = PJ_type_get("MSG_VM_STATE", vm_container->type); val_t value = PJ_value_get_or_new("start", "0 0 1", type); // start is blue - new_pajePushState(MSG_get_clock(), vm_container, type, value); + PushStateEvent(MSG_get_clock(), vm_container, type, value); } } @@ -319,7 +319,7 @@ static int migration_rx_fun(int argc, char *argv[]) // start link container_t msg = PJ_container_get(vm->cname()); type_t type = PJ_type_get("MSG_VM_LINK", PJ_type_get_root()); - new_pajeStartLink(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); + StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); // destroy existing container of this vm container_t existing_container = PJ_container_get(vm->cname()); @@ -332,7 +332,7 @@ static int migration_rx_fun(int argc, char *argv[]) // end link msg = PJ_container_get(vm->cname()); type = PJ_type_get("MSG_VM_LINK", PJ_type_get_root()); - new_pajeEndLink(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); + EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); } // Inform the SRC that the migration has been correctly performed @@ -823,7 +823,7 @@ void MSG_vm_suspend(msg_vm_t vm) container_t vm_container = PJ_container_get(vm->cname()); type_t type = PJ_type_get("MSG_VM_STATE", vm_container->type); val_t value = PJ_value_get_or_new("suspend", "1 0 0", type); // suspend is red - new_pajePushState(MSG_get_clock(), vm_container, type, value); + PushStateEvent(MSG_get_clock(), vm_container, type, value); } } @@ -839,7 +839,7 @@ void MSG_vm_resume(msg_vm_t vm) if (TRACE_msg_vm_is_enabled()) { container_t vm_container = PJ_container_get(vm->cname()); type_t type = PJ_type_get("MSG_VM_STATE", vm_container->type); - new_pajePopState(MSG_get_clock(), vm_container, type); + PopStateEvent(MSG_get_clock(), vm_container, type); } } -- 2.20.1