return NULL;
}
-static void linkContainers (const char *a1, const char *a2)
+static void linkContainers (const char *a1, const char *a2, xbt_dict_t filter)
{
//ignore loopback
if (strcmp (a1, "__loopback__") == 0 || strcmp (a2, "__loopback__") == 0)
return;
+ //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", a1, a2);
+ snprintf (aux2, INSTR_DEFAULT_STR_SIZE, "%s%s", a2, a1);
+ 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);
+
container_t a1_container = getContainerByName (a1);
type_t a1_type = a1_container->type;
type_t a2_type = a2_container->type;
container_t container = findCommonFather (getRootContainer(), a1_container, a2_container);
- xbt_assert0 (container != NULL, "common father not found");
+ xbt_assert (container != NULL, "common father not found");
//declare type
char link_typename[INSTR_DEFAULT_STR_SIZE];
new_pajeEndLink(SIMIX_get_clock(), container, link_type, a2_container, "G", key);
}
-static void recursiveGraphExtraction (container_t container)
+static void recursiveGraphExtraction (container_t container, xbt_dict_t filter)
{
if (xbt_dict_length(container->children)){
xbt_dict_cursor_t cursor = NULL;
char *child_name;
//bottom-up recursion
xbt_dict_foreach(container->children, cursor, child_name, child) {
- recursiveGraphExtraction (child);
+ recursiveGraphExtraction (child, filter);
}
//let's get routes
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)){
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);
+ linkContainers (previous_entity_name, link_name, filter);
previous_entity_name = link_name;
}
- linkContainers (previous_entity_name, child_name2);
+ linkContainers (previous_entity_name, child_name2, filter);
}else if (child1->kind == INSTR_AS &&
child2->kind == INSTR_AS &&
strcmp(child_name1, child_name2) != 0){
//no route between them, that's possible
continue;
}
- xbt_assert2(route!=NULL,
+ xbt_assert(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);
+ linkContainers (previous_entity_name, link_name, filter);
previous_entity_name = link_name;
}
- linkContainers (previous_entity_name, route->dst_gateway);
+ linkContainers (previous_entity_name, route->dst_gateway, filter);
}
}
}
- xbt_dict_free(&filter);
}
}
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);
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);
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);
- new_pajeSetVariable (0, new, bandwidth, atof(A_surfxml_link_bandwidth));
- new_pajeSetVariable (0, new, latency, atof(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 ()
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);
}
}
{
xbt_dynar_free(¤tContainer);
currentContainer = NULL;
- recursiveGraphExtraction (getRootContainer());
+ xbt_dict_t filter = xbt_dict_new ();
+ recursiveGraphExtraction (getRootContainer(), filter);
+ xbt_dict_free(&filter);
platform_created = 1;
TRACE_paje_dump_buffer(1);
}
*/
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;
