X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e7a674ab548877a615a048135694d7169da51212..1d558deeec797460abbfa5ed52f1e7ae784dcf7e:/src/instr/instr_routing.c diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c index 5613849568..c81c10318a 100644 --- a/src/instr/instr_routing.c +++ b/src/instr/instr_routing.c @@ -109,12 +109,18 @@ static void recursiveGraphExtraction (routing_component_t rc, container_t contai (child2->kind == INSTR_HOST || child2->kind == INSTR_ROUTER) && strcmp (child1_name, child2_name) != 0){ - xbt_dynar_t route = global_routing->get_route (child1_name, child2_name); - unsigned int cpt; - void *link; + xbt_dynar_t route = NULL; + route = global_routing->get_route_or_null (child1_name, child2_name); + if (route == NULL) continue; + + if (TRACE_onelink_only()){ + if (xbt_dynar_length (route) > 1) continue; + } container_t previous = child1; - xbt_dynar_foreach (route, cpt, link) { - char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name; + int i; + for (i = 0; i < xbt_dynar_length(route); i++){ + link_CM02_t *link = ((link_CM02_t*)xbt_dynar_get_ptr (route, i)); + char *link_name = (*link)->lmm_resource.generic_resource.name; container_t current = getContainerByName(link_name); linkContainers(container, previous, current, filter); previous = current; @@ -151,50 +157,52 @@ static void instr_routing_parse_start_AS () container_t root = newContainer (A_surfxml_AS_id, INSTR_AS, NULL); instr_paje_init (root); - currentContainer = xbt_dynar_new (sizeof(container_t), NULL); - xbt_dynar_push (currentContainer, &root); - if (TRACE_smpi_is_enabled()) { if (!TRACE_smpi_is_grouped()){ - container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); - type_t mpi = getContainerType("MPI", father->type); + type_t mpi = getContainerType("MPI", root->type); getStateType ("MPI_STATE", mpi); getLinkType ("MPI_LINK", getRootType(), mpi, mpi); } } + if (TRACE_needs_platform()){ + currentContainer = xbt_dynar_new (sizeof(container_t), NULL); + xbt_dynar_push (currentContainer, &root); + } return; } - container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); - container_t new = newContainer (A_surfxml_AS_id, INSTR_AS, father); - //push - xbt_dynar_push (currentContainer, &new); + if (TRACE_needs_platform()){ + container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); + container_t new = newContainer (A_surfxml_AS_id, INSTR_AS, father); + xbt_dynar_push (currentContainer, &new); + } } static void instr_routing_parse_end_AS () { - xbt_dynar_pop_ptr (currentContainer); + if (TRACE_needs_platform()){ + xbt_dynar_pop_ptr (currentContainer); + } } -static void instr_routing_parse_start_link () +static void instr_routing_parse_start_link (sg_platf_link_cbarg_t link) { container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); - const char *link_id = A_surfxml_link_id; - double bandwidth_value = atof(A_surfxml_link_bandwidth); - double latency_value = atof(A_surfxml_link_latency); + double bandwidth_value = link->bandwidth; + double latency_value = link->latency; xbt_dynar_t links_to_create = xbt_dynar_new (sizeof(char*), &xbt_free_ref); - if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX){ - char *up = bprintf("%s_UP", link_id); - char *down = bprintf("%s_DOWN", link_id); + if (link->policy == SURF_LINK_FULLDUPLEX){ + char *up = bprintf("%s_UP", link->id); + char *down = bprintf("%s_DOWN", link->id); xbt_dynar_push_as (links_to_create, char*, xbt_strdup(up)); xbt_dynar_push_as (links_to_create, char*, xbt_strdup(down)); free (up); free (down); }else{ - xbt_dynar_push_as (links_to_create, char*, strdup(link_id)); + xbt_dynar_push_as (links_to_create, char*, strdup(link->id)); } char *link_name = NULL; @@ -203,10 +211,12 @@ static void instr_routing_parse_start_link () container_t new = newContainer (link_name, INSTR_LINK, father); - type_t bandwidth = getVariableType ("bandwidth", NULL, new->type); - type_t latency = getVariableType ("latency", NULL, new->type); - new_pajeSetVariable (0, new, bandwidth, bandwidth_value); - new_pajeSetVariable (0, new, latency, latency_value); + if (TRACE_categorized() || TRACE_uncategorized()){ + type_t bandwidth = getVariableType ("bandwidth", NULL, new->type); + type_t latency = getVariableType ("latency", NULL, new->type); + new_pajeSetVariable (0, new, bandwidth, bandwidth_value); + new_pajeSetVariable (0, new, latency, latency_value); + } if (TRACE_uncategorized()){ getVariableType ("bandwidth_used", "0.5 0.5 0.5", new->type); } @@ -215,27 +225,23 @@ static void instr_routing_parse_start_link () xbt_dynar_free (&links_to_create); } -static void instr_routing_parse_end_link () -{ -} - -static void instr_routing_parse_start_host () +static void instr_routing_parse_start_host (sg_platf_host_cbarg_t host) { container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); - container_t new = newContainer (A_surfxml_host_id, INSTR_HOST, father); + container_t new = newContainer (host->id, INSTR_HOST, father); - type_t power = getVariableType ("power", NULL, new->type); - new_pajeSetVariable (0, new, power, atof(A_surfxml_host_power)); + if (TRACE_categorized() || TRACE_uncategorized()) { + type_t power = getVariableType ("power", NULL, new->type); + new_pajeSetVariable (0, new, power, host->power_peak); + } if (TRACE_uncategorized()){ getVariableType ("power_used", "0.5 0.5 0.5", new->type); } - if (TRACE_smpi_is_enabled()) { - if (TRACE_smpi_is_grouped()){ - type_t mpi = getContainerType("MPI", new->type); - getStateType ("MPI_STATE", mpi); - getLinkType ("MPI_LINK", getRootType(), mpi, mpi); - } + if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()){ + type_t mpi = getContainerType("MPI", new->type); + getStateType ("MPI_STATE", mpi); + getLinkType ("MPI_LINK", getRootType(), mpi, mpi); } if (TRACE_msg_process_is_enabled()) { @@ -260,18 +266,10 @@ static void instr_routing_parse_start_host () } } -static void instr_routing_parse_end_host () -{ -} - -static void instr_routing_parse_start_router () +static void instr_routing_parse_start_router (sg_platf_router_cbarg_t router) { container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); - newContainer (A_surfxml_router_id, INSTR_ROUTER, father); -} - -static void instr_routing_parse_end_router () -{ + newContainer (router->id, INSTR_ROUTER, father); } static void instr_routing_parse_end_platform () @@ -287,23 +285,23 @@ static void instr_routing_parse_end_platform () void instr_routing_define_callbacks () { - if (!TRACE_is_active()) - return; - surfxml_add_callback(STag_surfxml_AS_cb_list, &instr_routing_parse_start_AS); - surfxml_add_callback(ETag_surfxml_AS_cb_list, &instr_routing_parse_end_AS); - surfxml_add_callback(STag_surfxml_link_cb_list, &instr_routing_parse_start_link); - surfxml_add_callback(ETag_surfxml_link_cb_list, &instr_routing_parse_end_link); - surfxml_add_callback(STag_surfxml_host_cb_list, &instr_routing_parse_start_host); - surfxml_add_callback(ETag_surfxml_host_cb_list, &instr_routing_parse_end_host); - surfxml_add_callback(STag_surfxml_router_cb_list, &instr_routing_parse_start_router); - surfxml_add_callback(ETag_surfxml_router_cb_list, &instr_routing_parse_end_router); - surfxml_add_callback(ETag_surfxml_platform_cb_list, &instr_routing_parse_end_platform); + if (!TRACE_is_enabled()) return; + //always need the call backs to ASes (we need only the root AS), + //to create the rootContainer and the rootType properly + sg_platf_ASopen_add_cb(instr_routing_parse_start_AS); + sg_platf_ASclose_add_cb(instr_routing_parse_end_AS); + if (!TRACE_needs_platform()) return; + sg_platf_link_add_cb(instr_routing_parse_start_link); + sg_platf_host_add_cb(instr_routing_parse_start_host); + sg_platf_router_add_cb(instr_routing_parse_start_router); + + sg_platf_postparse_add_cb(instr_routing_parse_end_platform); } /* * user categories support */ -static void recursiveNewUserVariableType (const char *new_typename, const char *color, type_t root) +static void recursiveNewVariableType (const char *new_typename, const char *color, type_t root) { if (!strcmp (root->name, "HOST")){ char tnstr[INSTR_DEFAULT_STR_SIZE]; @@ -319,51 +317,34 @@ static void recursiveNewUserVariableType (const char *new_typename, const char * type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { - recursiveNewUserVariableType (new_typename, color, child_type); + recursiveNewVariableType (new_typename, color, child_type); } } -void instr_new_user_variable_type (const char *new_typename, const char *color) +void instr_new_variable_type (const char *new_typename, const char *color) { - recursiveNewUserVariableType (new_typename, color, getRootType()); + recursiveNewVariableType (new_typename, color, getRootType()); } -static void recursiveNewUserLinkVariableType (const char *new_typename, const char *color, type_t root) +static void recursiveNewUserVariableType (const char *father_type, const char *new_typename, const char *color, type_t root) { - if (!strcmp (root->name, "LINK")){ + if (!strcmp (root->name, father_type)){ getVariableType(new_typename, color, root); } xbt_dict_cursor_t cursor = NULL; type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { - recursiveNewUserLinkVariableType (new_typename, color, child_type); + recursiveNewUserVariableType (father_type, new_typename, color, child_type); } } -void instr_new_user_link_variable_type (const char *new_typename, const char *color) +void instr_new_user_variable_type (const char *father_type, const char *new_typename, const char *color) { - recursiveNewUserLinkVariableType (new_typename, color, getRootType()); + recursiveNewUserVariableType (father_type, new_typename, color, getRootType()); } -static void recursiveNewUserHostVariableType (const char *new_typename, const char *color, type_t root) -{ - if (!strcmp (root->name, "HOST")){ - getVariableType(new_typename, color, root); - } - xbt_dict_cursor_t cursor = NULL; - type_t child_type; - char *name; - xbt_dict_foreach(root->children, cursor, name, child_type) { - recursiveNewUserHostVariableType (new_typename, color, child_type); - } -} - -void instr_new_user_host_variable_type (const char *new_typename, const char *color) -{ - recursiveNewUserHostVariableType (new_typename, color, getRootType()); -} int instr_platform_traced () { @@ -432,6 +413,9 @@ static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb strcmp (child1_name, child2_name) != 0){ xbt_dynar_t route = global_routing->get_route (child1_name, child2_name); + if (TRACE_onelink_only()){ + if (xbt_dynar_length (route) > 1) continue; + } unsigned int cpt; void *link; xbt_node_t current, previous = new_xbt_graph_node(graph, child1_name, nodes);