X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b4ac368a8512fa8ec30d04f55c4a3c660e9439b9..a4e7a60bca6c13451f237201eb5a7534e5da0838:/src/surf/instr_routing.cpp diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp index cec863df5a..1a68583a5e 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) { @@ -68,7 +68,7 @@ static container_t lowestCommonAncestor (container_t a1, container_t a2) static void linkContainers(container_t src, container_t dst, std::set* filter) { //ignore loopback - if (src->name_ == "__loopback__" || dst->name_ == "__loopback__") { + if (src->getName() == "__loopback__" || dst->getName() == "__loopback__") { XBT_DEBUG (" linkContainers: ignoring loopback link"); return; } @@ -80,14 +80,14 @@ static void linkContainers(container_t src, container_t dst, std::setname_ + dst->name_; - std::string aux2 = dst->name_ + src->name_; + std::string aux1 = src->getName() + dst->getName(); + std::string aux2 = dst->getName() + src->getName(); if (filter->find(aux1) != filter->end()) { - XBT_DEBUG(" linkContainers: already registered %s <-> %s (1)", src->name_.c_str(), dst->name_.c_str()); + XBT_DEBUG(" linkContainers: already registered %s <-> %s (1)", src->getCname(), dst->getCname()); return; } if (filter->find(aux2) != filter->end()) { - XBT_DEBUG(" linkContainers: already registered %s <-> %s (2)", dst->name_.c_str(), src->name_.c_str()); + XBT_DEBUG(" linkContainers: already registered %s <-> %s (2)", dst->getCname(), src->getCname()); return; } @@ -106,14 +106,13 @@ static void linkContainers(container_t src, container_t dst, std::set %s", src->name_.c_str(), dst->name_.c_str()); + XBT_DEBUG(" linkContainers %s <-> %s", src->getCname(), dst->getCname()); } static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t container, @@ -133,20 +132,17 @@ static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t } xbt_graph_t graph = xbt_graph_new_graph (0, nullptr); - xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr); - xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr); - xbt_edge_t edge = nullptr; - - xbt_dict_cursor_t cursor = nullptr; - char *edge_name; + std::map* nodes = new std::map; + std::map* edges = new std::map; static_cast(netzone)->getGraph(graph, nodes, edges); - xbt_dict_foreach(edges,cursor,edge_name,edge) { + for (auto elm : *edges) { + xbt_edge_t edge = elm.second; linkContainers(simgrid::instr::Container::byName(static_cast(edge->src->data)), simgrid::instr::Container::byName(static_cast(edge->dst->data)), filter); } - xbt_dict_free (&nodes); - xbt_dict_free (&edges); + delete nodes; + delete edges; xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, nullptr); } @@ -158,8 +154,7 @@ 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); + simgrid::instr::NetZoneContainer* root = new simgrid::instr::NetZoneContainer(id, 0, nullptr); if (TRACE_smpi_is_enabled()) { simgrid::instr::Type* mpi = root->type_->getOrCreateContainerType("MPI"); @@ -175,8 +170,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); } } @@ -192,18 +187,15 @@ static void instr_routing_parse_start_link(simgrid::s4u::Link& link) { if (currentContainer.empty()) // No ongoing parsing. Are you creating the loopback? return; - container_t father = currentContainer.back(); - double bandwidth_value = link.bandwidth(); - double latency_value = link.latency(); - - container_t container = new simgrid::instr::Container(link.name(), simgrid::instr::INSTR_LINK, father); + container_t father = currentContainer.back(); + 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, bandwidth_value); - new simgrid::instr::SetVariableEvent(0, container, latency, latency_value); + new simgrid::instr::SetVariableEvent(0, container, bandwidth, link.bandwidth()); + new simgrid::instr::SetVariableEvent(0, container, latency, link.latency()); } if (TRACE_uncategorized()) { container->type_->getOrCreateVariableType("bandwidth_used", "0.5 0.5 0.5"); @@ -212,15 +204,13 @@ 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.getCname(), 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", ""); - - double current_speed_state = host.getSpeed(); - new simgrid::instr::SetVariableEvent(0, container, speed, current_speed_state); + new simgrid::instr::SetVariableEvent(0, container, speed, host.getSpeed()); } + if (TRACE_uncategorized()) container->type_->getOrCreateVariableType("power_used", "0.5 0.5 0.5"); @@ -230,11 +220,11 @@ static void sg_instr_new_host(simgrid::s4u::Host& host) 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::Value::byNameOrCreate("suspend", "1 0 1", state); - simgrid::instr::Value::byNameOrCreate("sleep", "1 1 0", state); - simgrid::instr::Value::byNameOrCreate("receive", "1 0 0", state); - simgrid::instr::Value::byNameOrCreate("send", "0 0 1", state); - simgrid::instr::Value::byNameOrCreate("task_execute", "0 1 1", 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"); simgrid::instr::Type::getRootType()->getOrCreateLinkType("MSG_PROCESS_LINK", msg_process, msg_process); simgrid::instr::Type::getRootType()->getOrCreateLinkType("MSG_PROCESS_TASK_LINK", msg_process, msg_process); } @@ -242,11 +232,11 @@ 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::Value::byNameOrCreate("suspend", "1 0 1", state); - simgrid::instr::Value::byNameOrCreate("sleep", "1 1 0", state); - simgrid::instr::Value::byNameOrCreate("receive", "1 0 0", state); - simgrid::instr::Value::byNameOrCreate("send", "0 0 1", state); - simgrid::instr::Value::byNameOrCreate("task_execute", "0 1 1", 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"); simgrid::instr::Type::getRootType()->getOrCreateLinkType("MSG_VM_LINK", msg_vm, msg_vm); simgrid::instr::Type::getRootType()->getOrCreateLinkType("MSG_VM_PROCESS_LINK", msg_vm, msg_vm); } @@ -254,12 +244,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()) { - container_t father = currentContainer.back(); - new simgrid::instr::Container(netpoint->getCname(), simgrid::instr::INSTR_ROUTER, father); - } + if (netpoint->isRouter() && TRACE_is_enabled() && TRACE_needs_platform()) + new simgrid::instr::RouterContainer(netpoint->getCname(), currentContainer.back()); } static void instr_routing_parse_end_platform () @@ -286,45 +272,45 @@ void instr_routing_define_callbacks () } simgrid::s4u::NetZone::onCreation.connect(sg_instr_AS_begin); simgrid::s4u::NetZone::onSeal.connect(sg_instr_AS_end); - simgrid::kernel::routing::NetPoint::onCreation.connect(&sg_instr_new_router); + simgrid::kernel::routing::NetPoint::onCreation.connect(sg_instr_new_router); } /* * user categories support */ -static void recursiveNewVariableType(const char* new_typename, const char* color, simgrid::instr::Type* root) +static void recursiveNewVariableType(std::string new_typename, std::string color, simgrid::instr::Type* root) { if (root->getName() == "HOST" || root->getName() == "MSG_VM") - root->getOrCreateVariableType(std::string("p") + new_typename, color == nullptr ? "" : color); + root->getOrCreateVariableType(std::string("p") + new_typename, color); if (root->getName() == "LINK") - root->getOrCreateVariableType(std::string("b") + new_typename, color == nullptr ? "" : color); + root->getOrCreateVariableType(std::string("b") + new_typename, color); for (auto elm : root->children_) { - recursiveNewVariableType(new_typename, color == nullptr ? "" : color, elm.second); + recursiveNewVariableType(new_typename, color, elm.second); } } -void instr_new_variable_type (const char *new_typename, const char *color) +void instr_new_variable_type(std::string new_typename, std::string color) { recursiveNewVariableType(new_typename, color, simgrid::instr::Type::getRootType()); } -static void recursiveNewUserVariableType(const char* father_type, const char* new_typename, const char* color, +static void recursiveNewUserVariableType(std::string father_type, std::string new_typename, std::string color, simgrid::instr::Type* root) { if (root->getName() == father_type) { - root->getOrCreateVariableType(new_typename, color == nullptr ? "" : color); + root->getOrCreateVariableType(new_typename, color); } for (auto elm : root->children_) recursiveNewUserVariableType(father_type, new_typename, color, elm.second); } -void instr_new_user_variable_type (const char *father_type, const char *new_typename, const char *color) +void instr_new_user_variable_type(std::string father_type, std::string new_typename, std::string color) { recursiveNewUserVariableType(father_type, new_typename, color, simgrid::instr::Type::getRootType()); } -static void recursiveNewUserStateType(const char* father_type, const char* new_typename, simgrid::instr::Type* root) +static void recursiveNewUserStateType(std::string father_type, std::string new_typename, simgrid::instr::Type* root) { if (root->getName() == father_type) { root->getOrCreateStateType(new_typename); @@ -333,22 +319,22 @@ static void recursiveNewUserStateType(const char* father_type, const char* new_t recursiveNewUserStateType(father_type, new_typename, elm.second); } -void instr_new_user_state_type (const char *father_type, const char *new_typename) +void instr_new_user_state_type(std::string father_type, std::string new_typename) { recursiveNewUserStateType(father_type, new_typename, simgrid::instr::Type::getRootType()); } -static void recursiveNewValueForUserStateType(const char* type_name, const char* val, const char* color, +static void recursiveNewValueForUserStateType(std::string type_name, const char* val, std::string color, simgrid::instr::Type* root) { if (root->getName() == type_name) - simgrid::instr::Value::byNameOrCreate(val, color, root); + root->addEntityValue(val, color); for (auto elm : root->children_) recursiveNewValueForUserStateType(type_name, val, color, elm.second); } -void instr_new_value_for_user_state_type (const char *type_name, const char *value, const char *color) +void instr_new_value_for_user_state_type(std::string type_name, const char* value, std::string color) { recursiveNewValueForUserStateType(type_name, value, color, simgrid::instr::Type::getRootType()); } @@ -360,7 +346,8 @@ int instr_platform_traced () #define GRAPHICATOR_SUPPORT_FUNCTIONS -static void recursiveXBTGraphExtraction(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, sg_netzone_t netzone, +static void recursiveXBTGraphExtraction(xbt_graph_t graph, std::map* nodes, + std::map* edges, sg_netzone_t netzone, container_t container) { if (not netzone->getChildren()->empty()) { @@ -377,12 +364,12 @@ static void recursiveXBTGraphExtraction(xbt_graph_t graph, xbt_dict_t nodes, xbt xbt_graph_t instr_routing_platform_graph () { xbt_graph_t ret = xbt_graph_new_graph (0, nullptr); - xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr); - xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr); + 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()); - xbt_dict_free (&nodes); - xbt_dict_free (&edges); + delete nodes; + delete edges; return ret; }