From 8fd7b1569e793631ddcbab2aa7c365d1285df115 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 9 May 2018 10:08:04 +0200 Subject: [PATCH] MSG_VM => VM in instr --- src/instr/instr_interface.cpp | 10 +++++----- src/instr/instr_platform.cpp | 18 +++++++++--------- src/plugins/vm/VmLiveMigration.cpp | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index df6c1c9f53..3715437e8b 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -354,7 +354,7 @@ int TRACE_platform_graph_export_graphviz (const char *filename) */ void TRACE_vm_variable_declare (const char *variable) { - instr_user_variable(0, nullptr, variable, "MSG_VM", 0, InstrUserVariable::DECLARE, nullptr, &user_vm_variables); + instr_user_variable(0, nullptr, variable, "VM", 0, InstrUserVariable::DECLARE, nullptr, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -369,7 +369,7 @@ void TRACE_vm_variable_declare (const char *variable) */ void TRACE_vm_variable_declare_with_color (const char *variable, const char *color) { - instr_user_variable(0, nullptr, variable, "MSG_VM", 0, InstrUserVariable::DECLARE, color, &user_vm_variables); + instr_user_variable(0, nullptr, variable, "VM", 0, InstrUserVariable::DECLARE, color, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -431,7 +431,7 @@ void TRACE_vm_variable_sub (const char *vm, const char *variable, double value) */ void TRACE_vm_variable_set_with_time (double time, const char *vm, const char *variable, double value) { - instr_user_variable(time, vm, variable, "MSG_VM", value, InstrUserVariable::SET, nullptr, &user_vm_variables); + instr_user_variable(time, vm, variable, "VM", value, InstrUserVariable::SET, nullptr, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -451,7 +451,7 @@ void TRACE_vm_variable_set_with_time (double time, const char *vm, const char *v */ void TRACE_vm_variable_add_with_time (double time, const char *vm, const char *variable, double value) { - instr_user_variable(time, vm, variable, "MSG_VM", value, InstrUserVariable::ADD, nullptr, &user_vm_variables); + instr_user_variable(time, vm, variable, "VM", value, InstrUserVariable::ADD, nullptr, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -471,7 +471,7 @@ void TRACE_vm_variable_add_with_time (double time, const char *vm, const char *v */ void TRACE_vm_variable_sub_with_time (double time, const char *vm, const char *variable, double value) { - instr_user_variable(time, vm, variable, "MSG_VM", value, InstrUserVariable::SUB, nullptr, &user_vm_variables); + instr_user_variable(time, vm, variable, "VM", value, InstrUserVariable::SUB, nullptr, &user_vm_variables); } /* for host variables */ diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp index 573d0683d0..293ae81ef5 100644 --- a/src/instr/instr_platform.cpp +++ b/src/instr/instr_platform.cpp @@ -303,35 +303,35 @@ static void instr_vm_on_creation(simgrid::s4u::Host& host) { container_t container = new simgrid::instr::HostContainer(host, currentContainer.back()); container_t root = simgrid::instr::Container::getRoot(); - simgrid::instr::ContainerType* msg_vm = container->type_->getOrCreateContainerType("MSG_VM"); - simgrid::instr::StateType* state = msg_vm->getOrCreateStateType("MSG_VM_STATE"); + simgrid::instr::ContainerType* msg_vm = container->type_->getOrCreateContainerType("VM"); + simgrid::instr::StateType* state = msg_vm->getOrCreateStateType("VM_STATE"); state->addEntityValue("suspend", "1 0 1"); state->addEntityValue("sleep", "1 1 0"); state->addEntityValue("receive", "1 0 0"); state->addEntityValue("send", "0 0 1"); state->addEntityValue("task_execute", "0 1 1"); - root->type_->getOrCreateLinkType("MSG_VM_LINK", msg_vm, msg_vm); - root->type_->getOrCreateLinkType("MSG_VM_ACTOR_LINK", msg_vm, msg_vm); + root->type_->getOrCreateLinkType("VM_LINK", msg_vm, msg_vm); + root->type_->getOrCreateLinkType("VM_ACTOR_LINK", msg_vm, msg_vm); } static void instr_vm_on_start(simgrid::s4u::VirtualMachine& vm) { - simgrid::instr::Container::byName(vm.get_name())->getState("MSG_VM_STATE")->pushEvent("start"); + simgrid::instr::Container::byName(vm.get_name())->getState("VM_STATE")->pushEvent("start"); } static void instr_vm_on_started(simgrid::s4u::VirtualMachine& vm) { - simgrid::instr::Container::byName(vm.get_name())->getState("MSG_VM_STATE")->popEvent(); + simgrid::instr::Container::byName(vm.get_name())->getState("VM_STATE")->popEvent(); } static void instr_vm_on_suspend(simgrid::s4u::VirtualMachine& vm) { - simgrid::instr::Container::byName(vm.get_name())->getState("MSG_VM_STATE")->pushEvent("suspend"); + simgrid::instr::Container::byName(vm.get_name())->getState("VM_STATE")->pushEvent("suspend"); } static void instr_vm_on_resume(simgrid::s4u::VirtualMachine& vm) { - simgrid::instr::Container::byName(vm.get_name())->getState("MSG_VM_STATE")->popEvent(); + simgrid::instr::Container::byName(vm.get_name())->getState("VM_STATE")->popEvent(); } static void instr_vm_on_destruction(simgrid::s4u::Host& host) @@ -374,7 +374,7 @@ void instr_define_callbacks() */ static void recursiveNewVariableType(std::string new_typename, std::string color, simgrid::instr::Type* root) { - if (root->get_name() == "HOST" || root->get_name() == "MSG_VM") + if (root->get_name() == "HOST" || root->get_name() == "VM") root->getOrCreateVariableType(std::string("p") + new_typename, color); if (root->get_name() == "LINK") diff --git a/src/plugins/vm/VmLiveMigration.cpp b/src/plugins/vm/VmLiveMigration.cpp index 84001da12f..0c1f7928a2 100644 --- a/src/plugins/vm/VmLiveMigration.cpp +++ b/src/plugins/vm/VmLiveMigration.cpp @@ -60,17 +60,17 @@ void MigrationRx::operator()() // start link container_t msg = simgrid::instr::Container::byName(vm_->get_name()); - simgrid::instr::Container::getRoot()->getLink("MSG_VM_LINK")->startEvent(msg, "M", key); + simgrid::instr::Container::getRoot()->getLink("VM_LINK")->startEvent(msg, "M", key); // destroy existing container of this vm simgrid::instr::Container::byName(vm_->get_name())->removeFromParent(); // create new container on the new_host location - new simgrid::instr::Container(vm_->get_cname(), "MSG_VM", simgrid::instr::Container::byName(dst_pm_->get_name())); + new simgrid::instr::Container(vm_->get_cname(), "VM", simgrid::instr::Container::byName(dst_pm_->get_name())); // end link msg = simgrid::instr::Container::byName(vm_->get_name()); - simgrid::instr::Container::getRoot()->getLink("MSG_VM_LINK")->endEvent(msg, "M", key); + simgrid::instr::Container::getRoot()->getLink("VM_LINK")->endEvent(msg, "M", key); } // Inform the SRC that the migration has been correctly performed std::string* payload = new std::string("__mig_stage4:"); -- 2.20.1