static void linkContainers (container_t src, container_t dst, xbt_dict_t filter)
{
//ignore loopback
- if (strcmp (src->name, "__loopback__") == 0 || strcmp (dst->name, "__loopback__") == 0)
+ if (strcmp (src->name, "__loopback__") == 0 || strcmp (dst->name, "__loopback__") == 0){
+ XBT_DEBUG (" linkContainers: ignoring loopback link");
return;
+ }
//find common father
container_t father = lowestCommonAncestor (src, dst);
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;
+ if (xbt_dict_get_or_null (filter, aux1)){
+ XBT_DEBUG (" linkContainers: already registered %s <-> %s (1)", src->name, dst->name);
+ return;
+ }
+ if (xbt_dict_get_or_null (filter, aux2)){
+ XBT_DEBUG (" linkContainers: already registered %s <-> %s (2)", dst->name, src->name);
+ return;
+ }
//ok, not found, register it
xbt_dict_set (filter, aux1, xbt_strdup ("1"), NULL);
static long long counter = 0;
char key[INSTR_DEFAULT_STR_SIZE];
snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter++);
- new_pajeStartLink(SIMIX_get_clock(), father, link_type, src, "G", key);
- new_pajeEndLink(SIMIX_get_clock(), father, link_type, dst, "G", key);
+ new_pajeStartLink(SIMIX_get_clock(), father, link_type, src, "topology", key);
+ new_pajeEndLink(SIMIX_get_clock(), father, link_type, dst, "topology", key);
+
+ XBT_DEBUG (" linkContainers %s <-> %s", src->name, dst->name);
+}
+
+static int graph_extraction_filter_out (container_t c1, container_t c2)
+{
+ if (c1->kind == INSTR_LINK ||
+ c1->kind == INSTR_SMPI ||
+ c1->kind == INSTR_MSG_PROCESS ||
+ c1->kind == INSTR_MSG_TASK ||
+ (c2 && strcmp (c1->name, c2->name) == 0))
+ return 1;
+ else
+ return 0;
}
static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t filter)
{
+ XBT_DEBUG ("Graph extraction for routing_component = %s", rc->name);
if (!xbt_dict_is_empty(rc->routing_sons)){
xbt_dict_cursor_t cursor = NULL;
AS_t rc_son;
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;
+ if (graph_extraction_filter_out (child1, NULL)) 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 = NULL;
- xbt_ex_t e;
+ if (graph_extraction_filter_out (child2, child1)) continue;
+ XBT_DEBUG ("get_route from %s to %s", child1_name, child2_name);
+
+ //get the route
+ sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t,1);
+ route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t),NULL);
+ rc->get_route_and_latency(rc, child1->net_elm, child2->net_elm,
+ route, NULL);
+
+ //user might want to extract a graph using routes with only one link
+ //see --cfg=tracing/onelink_only:1 or --help-tracing for details
+ if (TRACE_onelink_only() && xbt_dynar_length (route->link_list) > 1){
+ generic_free_route(route);
+ continue;
+ }
- TRY {
- routing_get_route_and_latency((network_element_t)(child1->net_elm),
- (network_element_t)(child2->net_elm),
- &route, NULL);
- } CATCH(e) {
- xbt_ex_free(e);
- }
- if (route == NULL) continue;
+ //traverse the route connecting the containers
+ unsigned int cpt;
+ void *link;
+ container_t current, previous;
+ if (route->gw_src){
+ previous = PJ_container_get(route->gw_src->name);
+ }else{
+ previous = child1;
+ }
- if (TRACE_onelink_only()){
- if (xbt_dynar_length (route) > 1) continue;
- }
- container_t previous = child1;
- 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 = PJ_container_get(link_name);
- linkContainers(previous, current, filter);
- previous = current;
- }
- linkContainers(previous, child2, filter);
-
- }else if (child1->kind == INSTR_AS &&
- child2->kind == INSTR_AS &&
- strcmp(child1_name, child2_name) != 0){
-
- route_t route = xbt_new0(s_route_t,1);
- route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
- rc->get_route_and_latency (rc,
- (network_element_t)(child1->net_elm),
- (network_element_t)(child2->net_elm), route,NULL);
- unsigned int cpt;
- void *link;
- container_t previous = PJ_container_get(route->src_gateway->name);
- xbt_dynar_foreach (route->link_list, cpt, link) {
- char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
- container_t current = PJ_container_get(link_name);
- linkContainers (previous, current, filter);
- previous = current;
- }
- container_t last = PJ_container_get(route->dst_gateway->name);
- linkContainers (previous, last, filter);
- generic_free_route(route);
+ xbt_dynar_foreach (route->link_list, cpt, link) {
+ //FIXME (TODO): Should have a cleaner way to get the link name
+ char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
+ current = PJ_container_get(link_name);
+ linkContainers(previous, current, filter);
+ previous = current;
}
+ if (route->gw_dst){
+ current = PJ_container_get(route->gw_dst->name);
+ }else{
+ current = child2;
+ }
+ linkContainers(previous, current, filter);
+ generic_free_route(route);
}
}
}
/*
* Callbacks
*/
-static void instr_routing_parse_start_AS (const char*id,const char*routing)
+static void instr_routing_parse_start_AS (sg_platf_AS_cbarg_t AS)
{
+ const char*id = AS->id;
+
if (PJ_container_get_root() == NULL){
PJ_container_alloc ();
PJ_type_alloc();
container_t new = PJ_container_new (link_name, INSTR_LINK, father);
- if (TRACE_categorized() || TRACE_uncategorized()){
+ if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()){
type_t bandwidth = PJ_type_get_or_null ("bandwidth", new->type);
if (bandwidth == NULL){
bandwidth = PJ_type_variable_new ("bandwidth", NULL, new->type);
container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
container_t new = PJ_container_new (host->id, INSTR_HOST, father);
- if (TRACE_categorized() || TRACE_uncategorized()) {
+ if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
type_t power = PJ_type_get_or_null ("power", new->type);
if (power == NULL){
power = PJ_type_variable_new ("power", NULL, new->type);
if (msg_process == NULL){
msg_process = PJ_type_container_new("MSG_PROCESS", new->type);
type_t state = PJ_type_state_new ("MSG_PROCESS_STATE", msg_process);
- PJ_value_new ("executing", "0 1 0", state);
PJ_value_new ("suspend", "1 0 1", state);
PJ_value_new ("sleep", "1 1 0", state);
PJ_value_new ("receive", "1 0 0", state);
xbt_dynar_free(¤tContainer);
currentContainer = NULL;
xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free);
- recursiveGraphExtraction (global_routing->root, PJ_container_get_root(), filter);
+ XBT_DEBUG ("Starting graph extraction.");
+ recursiveGraphExtraction (routing_platf->root, PJ_container_get_root(), filter);
+ XBT_DEBUG ("Graph extraction finished.");
xbt_dict_free(&filter);
platform_created = 1;
TRACE_paje_dump_buffer(1);
recursiveNewUserVariableType (father_type, new_typename, color, PJ_type_get_root());
}
+static void recursiveNewUserStateType (const char *father_type, const char *new_typename, type_t root)
+{
+ if (!strcmp (root->name, father_type)){
+ PJ_type_state_new (new_typename, root);
+ }
+ xbt_dict_cursor_t cursor = NULL;
+ type_t child_type;
+ char *name;
+ xbt_dict_foreach(root->children, cursor, name, child_type) {
+ recursiveNewUserStateType (father_type, new_typename, child_type);
+ }
+}
+
+void instr_new_user_state_type (const char *father_type, const char *new_typename)
+{
+ recursiveNewUserStateType (father_type, new_typename, PJ_type_get_root());
+}
+
+static void recursiveNewValueForUserStateType (const char *typename, const char *value, const char *color, type_t root)
+{
+ if (!strcmp (root->name, typename)){
+ PJ_value_new (value, color, root);
+ }
+ xbt_dict_cursor_t cursor = NULL;
+ type_t child_type;
+ char *name;
+ xbt_dict_foreach(root->children, cursor, name, child_type) {
+ recursiveNewValueForUserStateType (typename, value, color, child_type);
+ }
+}
+void instr_new_value_for_user_state_type (const char *typename, const char *value, const char *color)
+{
+ recursiveNewValueForUserStateType (typename, value, color, PJ_type_get_root());
+}
int instr_platform_traced ()
{
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;
+ //if child1 is not a link, a smpi node, a msg process or a msg task
+ if (child1->kind == INSTR_LINK || child1->kind == INSTR_SMPI || child1->kind == INSTR_MSG_PROCESS || child1->kind == INSTR_MSG_TASK) 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){
-
- // FIXME factorize route creation with else branch below (once possible)
- xbt_dynar_t route=NULL;
- routing_get_route_and_latency ((network_element_t)(child1->net_elm),
- (network_element_t)(child2->net_elm),
- &route,NULL);
- 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);
- xbt_dynar_foreach (route, cpt, link) {
- char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
- current = new_xbt_graph_node(graph, link_name, nodes);
- new_xbt_graph_edge (graph, previous, current, edges);
- //previous -> current
- previous = current;
- }
- current = new_xbt_graph_node(graph, child2_name, nodes);
- new_xbt_graph_edge (graph, previous, current, edges);
+ //if child2 is not a link, a smpi node, a msg process or a msg task
+ if (child2->kind == INSTR_LINK || child2->kind == INSTR_SMPI || child2->kind == INSTR_MSG_PROCESS || child2->kind == INSTR_MSG_TASK) continue;
+
+ //if child1 is not child2
+ if (strcmp (child1_name, child2_name) == 0) continue;
+
+ //get the route
+ sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t,1);
+ route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t),NULL);
+ rc->get_route_and_latency(rc, child1->net_elm, child2->net_elm,
+ route, NULL);
+
+ //user might want to extract a graph using routes with only one link
+ //see --cfg=tracing/onelink_only:1 or --help-tracing for details
+ if (TRACE_onelink_only() && xbt_dynar_length (route->link_list) > 1) continue;
+
+ //traverse the route connecting the containers
+ unsigned int cpt;
+ void *link;
+ xbt_node_t current, previous;
+ if (route->gw_src){
+ previous = new_xbt_graph_node(graph, route->gw_src->name, nodes);
+ }else{
+ previous = new_xbt_graph_node(graph, child1_name, nodes);
+ }
- }else if (child1->kind == INSTR_AS &&
- child2->kind == INSTR_AS &&
- strcmp(child1_name, child2_name) != 0){
-
- route_t route = xbt_new0(s_route_t,1);
- route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
- rc->get_route_and_latency (rc,
- (network_element_t)(child1->net_elm),
- (network_element_t)(child2->net_elm),route, NULL);
- unsigned int cpt;
- void *link;
- xbt_node_t current, previous = new_xbt_graph_node(graph, route->src_gateway->name, nodes);
- xbt_dynar_foreach (route->link_list, cpt, link) {
- char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
- current = new_xbt_graph_node(graph, link_name, nodes);
- //previous -> current
- previous = current;
- }
- current = new_xbt_graph_node(graph, route->dst_gateway->name, nodes);
+ xbt_dynar_foreach (route->link_list, cpt, link) {
+ char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
+ current = new_xbt_graph_node(graph, link_name, nodes);
new_xbt_graph_edge (graph, previous, current, edges);
- generic_free_route(route);
+ //previous -> current
+ previous = current;
+ }
+ if (route->gw_dst){
+ current = new_xbt_graph_node(graph, route->gw_dst->name, nodes);
+ }else{
+ current = new_xbt_graph_node(graph, child2_name, nodes);
}
+ new_xbt_graph_edge (graph, previous, current, edges);
+ generic_free_route(route);
}
}
xbt_graph_t ret = xbt_graph_new_graph (0, NULL);
xbt_dict_t nodes = xbt_dict_new_homogeneous(NULL);
xbt_dict_t edges = xbt_dict_new_homogeneous(NULL);
- recursiveXBTGraphExtraction (ret, nodes, edges, global_routing->root, PJ_container_get_root());
+ recursiveXBTGraphExtraction (ret, nodes, edges, routing_platf->root, PJ_container_get_root());
xbt_dict_free (&nodes);
xbt_dict_free (&edges);
return ret;
