* under the terms of the license (GNU LGPL) which comes with this package. */
#include "instr/instr_private.h"
+#include "mc/mc.h"
#ifdef HAVE_TRACING
#include "surf/surf_private.h"
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);
//create the link
static long long counter = 0;
+
+ if(MC_is_active())
+ MC_ignore_data_bss(&counter, sizeof(counter));
+
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)
{
+ if (!TRACE_platform_topology()){
+ XBT_DEBUG("Graph extracing disable by user.");
+ return;
+ }
+ 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 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;
-
+ if (graph_extraction_filter_out (child1, NULL)) continue;
xbt_dict_foreach(container->children, cursor2, child2_name, child2) {
- //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;
+ if (graph_extraction_filter_out (child2, child1)) continue;
+ XBT_DEBUG ("get_route from %s to %s", child1_name, child2_name);
//get the route
- route_t route = xbt_new0(s_route_t,1);
+ 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);
unsigned int cpt;
void *link;
container_t current, previous;
- if (route->src_gateway){
- previous = PJ_container_get(route->src_gateway->name);
+ if (route->gw_src){
+ previous = PJ_container_get(route->gw_src->name);
}else{
previous = child1;
}
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->dst_gateway){
- current = PJ_container_get(route->dst_gateway->name);
+ if (route->gw_dst){
+ current = PJ_container_get(route->gw_dst->name);
}else{
current = child2;
}
/*
* 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();
xbt_dynar_free(¤tContainer);
currentContainer = NULL;
xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free);
+ 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 ()
{
const char *sn = instr_node_name (s);
const char *dn = instr_node_name (d);
int len = strlen(sn)+strlen(dn)+1;
- char *name = (char*)malloc(len * sizeof(char));
+ char *name = (char*)xbt_malloc(len * sizeof(char));
snprintf (name, len, "%s%s", sn, dn);
if (strcmp (child1_name, child2_name) == 0) continue;
//get the route
- route_t route = xbt_new0(s_route_t,1);
+ 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);
unsigned int cpt;
void *link;
xbt_node_t current, previous;
- if (route->src_gateway){
- previous = new_xbt_graph_node(graph, route->src_gateway->name, nodes);
+ 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);
}
//previous -> current
previous = current;
}
- if (route->dst_gateway){
- current = new_xbt_graph_node(graph, route->dst_gateway->name, nodes);
+ 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);
}
