X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dd89cc2577e61b4b86b1ae7bc58dfa2ad00747e6..93d4164c9d94cbadae79947ac3f378b08c947390:/src/surf/instr_routing.cpp diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp index fdb97b0faa..3272ca9b33 100644 --- a/src/surf/instr_routing.cpp +++ b/src/surf/instr_routing.cpp @@ -17,7 +17,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_routing, instr, "Tracing platform hierarchy"); static int platform_created = 0; /* indicate whether the platform file has been traced */ -static std::vector currentContainer; /* push and pop, used only in creation */ +static std::vector currentContainer; /* push and pop, used only in creation */ static const char *instr_node_name (xbt_node_t node) { @@ -96,8 +96,9 @@ static void linkContainers(container_t src, container_t dst, std::setinsert(aux2); //declare type - std::string link_typename = father->type_->getName() + "-" + src->type_->getName() + src->type_->getId() + "-" + - dst->type_->getName() + dst->type_->getId(); + std::string link_typename = father->type_->getName() + "-" + src->type_->getName() + + std::to_string(src->type_->getId()) + "-" + dst->type_->getName() + + std::to_string(dst->type_->getId()); simgrid::instr::Type* link_type = father->type_->getOrCreateLinkType(link_typename, src->type_, dst->type_); //register EDGE types for triva configuration @@ -153,9 +154,8 @@ static void sg_instr_AS_begin(simgrid::s4u::NetZone& netzone) { std::string id = netzone.getName(); - if (PJ_container_get_root() == nullptr){ - container_t root = new simgrid::instr::Container(id, simgrid::instr::INSTR_AS, nullptr); - PJ_container_set_root (root); + if (simgrid::instr::Container::getRootContainer() == nullptr) { + simgrid::instr::NetZoneContainer* root = new simgrid::instr::NetZoneContainer(id, 0, nullptr); if (TRACE_smpi_is_enabled()) { simgrid::instr::Type* mpi = root->type_->getOrCreateContainerType("MPI"); @@ -171,8 +171,8 @@ static void sg_instr_AS_begin(simgrid::s4u::NetZone& netzone) } if (TRACE_needs_platform()){ - container_t father = currentContainer.back(); - container_t container = new simgrid::instr::Container(id, simgrid::instr::INSTR_AS, father); + simgrid::instr::NetZoneContainer* container = + new simgrid::instr::NetZoneContainer(id, currentContainer.size(), currentContainer.back()); currentContainer.push_back(container); } } @@ -190,13 +190,11 @@ static void instr_routing_parse_start_link(simgrid::s4u::Link& link) return; container_t father = currentContainer.back(); - container_t container = new simgrid::instr::Container(link.getName(), simgrid::instr::INSTR_LINK, father); + container_t container = new simgrid::instr::Container(link.getName(), "LINK", father); if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) { - simgrid::instr::Type* bandwidth = container->type_->getOrCreateVariableType("bandwidth", ""); - simgrid::instr::Type* latency = container->type_->getOrCreateVariableType("latency", ""); - new simgrid::instr::SetVariableEvent(0, container, bandwidth, link.bandwidth()); - new simgrid::instr::SetVariableEvent(0, container, latency, link.latency()); + container->type_->getOrCreateVariableType("bandwidth", "")->setEvent(0, container, link.bandwidth()); + container->type_->getOrCreateVariableType("latency", "")->setEvent(0, container, link.latency()); } if (TRACE_uncategorized()) { container->type_->getOrCreateVariableType("bandwidth_used", "0.5 0.5 0.5"); @@ -205,12 +203,10 @@ static void instr_routing_parse_start_link(simgrid::s4u::Link& link) static void sg_instr_new_host(simgrid::s4u::Host& host) { - container_t father = currentContainer.back(); - container_t container = new simgrid::instr::Container(host.getName(), simgrid::instr::INSTR_HOST, father); + container_t container = new simgrid::instr::HostContainer(host, currentContainer.back()); if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) { - simgrid::instr::Type* speed = container->type_->getOrCreateVariableType("power", ""); - new simgrid::instr::SetVariableEvent(0, container, speed, host.getSpeed()); + container->type_->getOrCreateVariableType("power", "")->setEvent(0, container, host.getSpeed()); } if (TRACE_uncategorized()) @@ -220,8 +216,8 @@ static void sg_instr_new_host(simgrid::s4u::Host& host) container->type_->getOrCreateContainerType("MPI")->getOrCreateStateType("MPI_STATE"); if (TRACE_msg_process_is_enabled()) { - simgrid::instr::Type* msg_process = container->type_->getOrCreateContainerType("MSG_PROCESS"); - simgrid::instr::Type* state = msg_process->getOrCreateStateType("MSG_PROCESS_STATE"); + simgrid::instr::ContainerType* msg_process = container->type_->getOrCreateContainerType("MSG_PROCESS"); + simgrid::instr::StateType* state = msg_process->getOrCreateStateType("MSG_PROCESS_STATE"); state->addEntityValue("suspend", "1 0 1"); state->addEntityValue("sleep", "1 1 0"); state->addEntityValue("receive", "1 0 0"); @@ -232,8 +228,8 @@ static void sg_instr_new_host(simgrid::s4u::Host& host) } if (TRACE_msg_vm_is_enabled()) { - simgrid::instr::Type* msg_vm = container->type_->getOrCreateContainerType("MSG_VM"); - simgrid::instr::Type* state = msg_vm->getOrCreateStateType("MSG_VM_STATE"); + simgrid::instr::ContainerType* msg_vm = container->type_->getOrCreateContainerType("MSG_VM"); + simgrid::instr::StateType* state = msg_vm->getOrCreateStateType("MSG_VM_STATE"); state->addEntityValue("suspend", "1 0 1"); state->addEntityValue("sleep", "1 1 0"); state->addEntityValue("receive", "1 0 0"); @@ -246,10 +242,8 @@ static void sg_instr_new_host(simgrid::s4u::Host& host) static void sg_instr_new_router(simgrid::kernel::routing::NetPoint * netpoint) { - if (not netpoint->isRouter()) - return; - if (TRACE_is_enabled() && TRACE_needs_platform()) - new simgrid::instr::Container(netpoint->getCname(), simgrid::instr::INSTR_ROUTER, currentContainer.back()); + if (netpoint->isRouter() && TRACE_is_enabled() && TRACE_needs_platform()) + new simgrid::instr::RouterContainer(netpoint->getCname(), currentContainer.back()); } static void instr_routing_parse_end_platform () @@ -257,7 +251,8 @@ static void instr_routing_parse_end_platform () currentContainer.clear(); std::set* filter = new std::set; XBT_DEBUG ("Starting graph extraction."); - recursiveGraphExtraction(simgrid::s4u::Engine::getInstance()->getNetRoot(), PJ_container_get_root(), filter); + recursiveGraphExtraction(simgrid::s4u::Engine::getInstance()->getNetRoot(), + simgrid::instr::Container::getRootContainer(), filter); XBT_DEBUG ("Graph extraction finished."); delete filter; platform_created = 1; @@ -316,9 +311,9 @@ void instr_new_user_variable_type(std::string father_type, std::string new_typen static void recursiveNewUserStateType(std::string father_type, std::string new_typename, simgrid::instr::Type* root) { - if (root->getName() == father_type) { + if (root->getName() == father_type) root->getOrCreateStateType(new_typename); - } + for (auto elm : root->children_) recursiveNewUserStateType(father_type, new_typename, elm.second); } @@ -332,7 +327,7 @@ static void recursiveNewValueForUserStateType(std::string type_name, const char* simgrid::instr::Type* root) { if (root->getName() == type_name) - root->addEntityValue(val, color); + static_cast(root)->addEntityValue(val, color); for (auto elm : root->children_) recursiveNewValueForUserStateType(type_name, val, color, elm.second); @@ -371,7 +366,7 @@ xbt_graph_t instr_routing_platform_graph () std::map* nodes = new std::map; std::map* edges = new std::map; recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::getInstance()->getNetRoot(), - PJ_container_get_root()); + simgrid::instr::Container::getRootContainer()); delete nodes; delete edges; return ret;