X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5744268bf404292887f93d4521a94579c9aaea93..85d7d7b422da4ba7451be14ffa4889e165e73038:/src/instr/instr_routing.c diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c index 9c38de1e30..20ff7eace4 100644 --- a/src/instr/instr_routing.c +++ b/src/instr/instr_routing.c @@ -17,31 +17,6 @@ extern xbt_dict_t defined_types; /* from instr_interface.c */ static int platform_created = 0; /* indicate whether the platform file has been traced */ static xbt_dynar_t currentContainer = NULL; /* push and pop, used only in creation */ -static void instr_routing_parse_start_AS (void); -static void instr_routing_parse_end_AS (void); -static void instr_routing_parse_start_link (void); -static void instr_routing_parse_end_link (void); -static void instr_routing_parse_start_host (void); -static void instr_routing_parse_end_host (void); -static void instr_routing_parse_start_router (void); -static void instr_routing_parse_end_router (void); -static void instr_routing_parse_end_platform (void); - -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); -} - static container_t findChild (container_t root, container_t a1) { if (root == a1) return root; @@ -72,117 +47,97 @@ static container_t findCommonFather (container_t root, container_t a1, container return NULL; } -static void linkContainers (const char *a1, const char *a2) +static void linkContainers (container_t father, container_t src, container_t dst, xbt_dict_t filter) { //ignore loopback - if (strcmp (a1, "__loopback__") == 0 || strcmp (a2, "__loopback__") == 0) + if (strcmp (src->name, "__loopback__") == 0 || strcmp (dst->name, "__loopback__") == 0) return; - container_t a1_container = getContainerByName (a1); - type_t a1_type = a1_container->type; - - container_t a2_container = getContainerByName (a2); - type_t a2_type = a2_container->type; - - container_t container = findCommonFather (getRootContainer(), a1_container, a2_container); - xbt_assert0 (container != NULL, "common father not found"); + if (filter != NULL){ + //check if we already register this pair (we only need one direction) + char aux1[INSTR_DEFAULT_STR_SIZE], aux2[INSTR_DEFAULT_STR_SIZE]; + snprintf (aux1, INSTR_DEFAULT_STR_SIZE, "%s%s", src->name, dst->name); + snprintf (aux2, INSTR_DEFAULT_STR_SIZE, "%s%s", dst->name, src->name); + if (xbt_dict_get_or_null (filter, aux1)) return; + if (xbt_dict_get_or_null (filter, aux2)) return; + + //ok, not found, register it + xbt_dict_set (filter, aux1, xbt_strdup ("1"), xbt_free); + xbt_dict_set (filter, aux2, xbt_strdup ("1"), xbt_free); + } //declare type char link_typename[INSTR_DEFAULT_STR_SIZE]; - snprintf (link_typename, INSTR_DEFAULT_STR_SIZE, "%s-%s", a1_type->name, a2_type->name); - type_t link_type = getLinkType (link_typename, container->type, a1_type, a2_type); + snprintf (link_typename, INSTR_DEFAULT_STR_SIZE, "%s-%s", src->type->name, dst->type->name); + type_t link_type = getLinkType (link_typename, father->type, src->type, dst->type); + + //register EDGE types for triva configuration + xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), xbt_free); //create the link static long long counter = 0; char key[INSTR_DEFAULT_STR_SIZE]; snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter++); - pajeStartLink(SIMIX_get_clock(), link_type->id, container->id, "G", a1_container->id, key); - pajeEndLink(SIMIX_get_clock(), link_type->id, container->id, "G", a2_container->id, key); + new_pajeStartLink(SIMIX_get_clock(), father, link_type, src, "G", key); + new_pajeEndLink(SIMIX_get_clock(), father, link_type, dst, "G", key); } -static void recursiveGraphExtraction (container_t container) +static void recursiveGraphExtraction (routing_component_t rc, container_t container, xbt_dict_t filter) { - if (xbt_dict_length(container->children)){ + if (xbt_dict_length (rc->routing_sons)){ xbt_dict_cursor_t cursor = NULL; - container_t child; + routing_component_t rc_son; char *child_name; //bottom-up recursion - xbt_dict_foreach(container->children, cursor, child_name, child) { - recursiveGraphExtraction (child); + xbt_dict_foreach(rc->routing_sons, cursor, child_name, rc_son) { + container_t child_container = xbt_dict_get (container->children, rc_son->name); + recursiveGraphExtraction (rc_son, child_container, filter); } + } - //let's get routes - xbt_dict_cursor_t cursor1 = NULL, cursor2 = NULL; - container_t child1, child2; - const char *child_name1, *child_name2; - - xbt_dict_t filter = xbt_dict_new (); - - xbt_dict_foreach(container->children, cursor1, child_name1, child1) { - xbt_dict_foreach(container->children, cursor2, child_name2, child2) { - //check if we already register this pair (we only need one direction) - char aux1[INSTR_DEFAULT_STR_SIZE], aux2[INSTR_DEFAULT_STR_SIZE]; - snprintf (aux1, INSTR_DEFAULT_STR_SIZE, "%s%s", child_name1, child_name2); - snprintf (aux2, INSTR_DEFAULT_STR_SIZE, "%s%s", child_name2, child_name1); - if (xbt_dict_get_or_null (filter, aux1)) continue; - if (xbt_dict_get_or_null (filter, aux2)) continue; - - //ok, not found, register it - xbt_dict_set (filter, aux1, xbt_strdup ("1"), xbt_free); - xbt_dict_set (filter, aux2, xbt_strdup ("1"), xbt_free); - - if ((child1->kind == INSTR_HOST || child1->kind == INSTR_ROUTER) && - (child2->kind == INSTR_HOST || child2->kind == INSTR_ROUTER)){ - - //getting route - xbt_dynar_t route = NULL; - xbt_ex_t exception; - TRY { - route = global_routing->get_route (child_name1, child_name2); - }CATCH(exception) { - //no route between them, that's possible - continue; - } - - //link the route members - unsigned int cpt; - void *link; - char *previous_entity_name = (char*)child_name1; - xbt_dynar_foreach (route, cpt, link) { - char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name; - linkContainers (previous_entity_name, link_name); - previous_entity_name = link_name; - } - linkContainers (previous_entity_name, child_name2); - }else if (child1->kind == INSTR_AS && - child2->kind == INSTR_AS && - strcmp(child_name1, child_name2) != 0){ - - //getting route - routing_component_t root = global_routing->root; - route_extended_t route = NULL; - xbt_ex_t exception; - TRY { - route = root->get_route (root, child_name1, child_name2); - }CATCH(exception) { - //no route between them, that's possible - continue; - } - xbt_assert2(route!=NULL, - "there is no ASroute between %s and %s", child_name1, child_name2); - unsigned int cpt; - void *link; - char *previous_entity_name = route->src_gateway; - xbt_dynar_foreach (route->generic_route.link_list, cpt, link) { - char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name; - linkContainers (previous_entity_name, link_name); - previous_entity_name = link_name; - } - linkContainers (previous_entity_name, route->dst_gateway); + //let's get routes + xbt_dict_cursor_t cursor1 = NULL, cursor2 = NULL; + container_t child1, child2; + const char *child1_name, *child2_name; + xbt_dict_foreach(container->children, cursor1, child1_name, child1) { + if (child1->kind == INSTR_LINK) continue; + xbt_dict_foreach(container->children, cursor2, child2_name, child2) { + if (child2->kind == INSTR_LINK) continue; + + if ((child1->kind == INSTR_HOST || child1->kind == INSTR_ROUTER) && + (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; + container_t previous = child1; + xbt_dynar_foreach (route, cpt, link) { + char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name; + container_t current = getContainerByName(link_name); + linkContainers(container, previous, current, filter); + previous = current; + } + linkContainers(container, previous, child2, filter); + + }else if (child1->kind == INSTR_AS && + child2->kind == INSTR_AS && + strcmp(child1_name, child2_name) != 0){ + + route_extended_t route = rc->get_route (rc, child1_name, child2_name); + unsigned int cpt; + void *link; + container_t previous = getContainerByName(route->src_gateway); + xbt_dynar_foreach (route->generic_route.link_list, cpt, link) { + char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name; + container_t current = getContainerByName(link_name); + linkContainers (container, previous, current, filter); + previous = current; } + container_t last = getContainerByName(route->dst_gateway); + linkContainers (container, previous, last, filter); } } - xbt_dict_free(&filter); } } @@ -192,7 +147,7 @@ static void recursiveGraphExtraction (container_t container) static void instr_routing_parse_start_AS () { if (getRootContainer() == NULL){ - container_t root = newContainer ("0", INSTR_AS, NULL); + container_t root = newContainer (A_surfxml_AS_id, INSTR_AS, NULL); instr_paje_init (root); currentContainer = xbt_dynar_new (sizeof(container_t), NULL); @@ -206,6 +161,8 @@ static void instr_routing_parse_start_AS () getLinkType ("MPI_LINK", getRootType(), mpi, mpi); } } + + 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); @@ -222,15 +179,39 @@ static void instr_routing_parse_end_AS () static void instr_routing_parse_start_link () { container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); - container_t new = newContainer (A_surfxml_link_id, INSTR_LINK, father); + const char *link_id = A_surfxml_link_id; + + double bandwidth_value = atof(A_surfxml_link_bandwidth); + double latency_value = atof(A_surfxml_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); + 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)); + } - type_t bandwidth = getVariableType ("bandwidth", NULL, new->type); - type_t latency = getVariableType ("latency", NULL, new->type); - pajeSetVariable (0, bandwidth->id, new->id, A_surfxml_link_bandwidth); - pajeSetVariable (0, latency->id, new->id, A_surfxml_link_latency); - if (TRACE_uncategorized()){ - getVariableType ("bandwidth_used", "0.5 0.5 0.5", new->type); + char *link_name = NULL; + unsigned int i; + xbt_dynar_foreach (links_to_create, i, link_name){ + + 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_uncategorized()){ + getVariableType ("bandwidth_used", "0.5 0.5 0.5", new->type); + } } + + xbt_dynar_free (&links_to_create); } static void instr_routing_parse_end_link () @@ -243,7 +224,7 @@ static void instr_routing_parse_start_host () container_t new = newContainer (A_surfxml_host_id, INSTR_HOST, father); type_t power = getVariableType ("power", NULL, new->type); - pajeSetVariable (0, power->id, new->id, A_surfxml_host_power); + new_pajeSetVariable (0, new, power, atof(A_surfxml_host_power)); if (TRACE_uncategorized()){ getVariableType ("power_used", "0.5 0.5 0.5", new->type); } @@ -258,13 +239,22 @@ static void instr_routing_parse_start_host () if (TRACE_msg_process_is_enabled()) { type_t msg_process = getContainerType("MSG_PROCESS", new->type); - getStateType ("MSG_PROCESS_STATE", msg_process); + type_t state = getStateType ("MSG_PROCESS_STATE", msg_process); + getValue ("executing", "0 1 0", state); + getValue ("suspend", "1 0 1", state); + getValue ("sleep", "1 1 0", state); + getValue ("receive", "1 0 0", state); + getValue ("send", "0 0 1", state); + getValue ("task_execute", "0 1 1", state); getLinkType ("MSG_PROCESS_LINK", getRootType(), msg_process, msg_process); + getLinkType ("MSG_PROCESS_TASK_LINK", getRootType(), msg_process, msg_process); } if (TRACE_msg_task_is_enabled()) { type_t msg_task = getContainerType ("MSG_TASK", new->type); - getStateType ("MSG_TASK_STATE", msg_task); + type_t state = getStateType ("MSG_TASK_STATE", msg_task); + getValue ("MSG_task_execute", "0 1 0", state); + getValue ("created", "1 1 0", state); getLinkType ("MSG_TASK_LINK", getRootType(), msg_task, msg_task); } } @@ -287,69 +277,26 @@ static void instr_routing_parse_end_platform () { xbt_dynar_free(¤tContainer); currentContainer = NULL; - recursiveGraphExtraction (getRootContainer()); + xbt_dict_t filter = xbt_dict_new (); + recursiveGraphExtraction (global_routing->root, getRootContainer(), filter); + xbt_dict_free(&filter); platform_created = 1; + TRACE_paje_dump_buffer(1); } -/* - * Support functions - */ -int instr_link_is_traced (const char *name) -{ - if (getContainerByName(name)){ - return 1; - } else { - return 0; - } -} - -char *instr_variable_type (const char *name, const char *resource) -{ - container_t container = getContainerByName(resource); - xbt_dict_cursor_t cursor = NULL; - type_t type; - char *type_name; - xbt_dict_foreach(container->type->children, cursor, type_name, type) { - if (strcmp (name, type->name) == 0) return type->id; - } - return NULL; -} - -char *instr_resource_type (const char *resource_name) -{ - return getContainerByName(resource_name)->id; -} - -static void recursiveDestroyContainer (container_t container) -{ - xbt_dict_cursor_t cursor = NULL; - container_t child; - char *child_name; - xbt_dict_foreach(container->children, cursor, child_name, child) { - recursiveDestroyContainer (child); - } - destroyContainer (container); -} - -static void recursiveDestroyType (type_t type) -{ - xbt_dict_cursor_t cursor = NULL; - type_t child; - char *child_name; - xbt_dict_foreach(type->children, cursor, child_name, child) { - recursiveDestroyType (child); - } - xbt_free (type->name); - xbt_free (type->id); - xbt_free (type->children); - xbt_free (type); - type = NULL; -} - -void instr_destroy_platform () +void instr_routing_define_callbacks () { - if (getRootContainer()) recursiveDestroyContainer (getRootContainer()); - if (getRootType()) recursiveDestroyType (getRootType()); + 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); } /* @@ -357,8 +304,15 @@ void instr_destroy_platform () */ static void recursiveNewUserVariableType (const char *new_typename, const char *color, type_t root) { - if (!strcmp (root->name, "HOST") || !strcmp (root->name, "LINK")){ - getVariableType(new_typename, color, root); + if (!strcmp (root->name, "HOST")){ + char tnstr[INSTR_DEFAULT_STR_SIZE]; + snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "p%s", new_typename); + getVariableType(tnstr, color, root); + } + if (!strcmp (root->name, "LINK")){ + char tnstr[INSTR_DEFAULT_STR_SIZE]; + snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "b%s", new_typename); + getVariableType(tnstr, color, root); } xbt_dict_cursor_t cursor = NULL; type_t child_type;