* 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"
//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, "topology", key);
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;
container_t child1, child2;
const char *child1_name, *child2_name;
xbt_dict_foreach(container->children, cursor1, child1_name, child1) {
- if (graph_extraction_filter_out (child1, NULL)) continue;
+ //if child1 is not a link, a smpi node, a msg process, a msg vm or a msg task
+ if (child1->kind == INSTR_LINK || child1->kind == INSTR_SMPI || child1->kind == INSTR_MSG_PROCESS || child1->kind == INSTR_MSG_VM || child1->kind == INSTR_MSG_TASK) continue;
+
xbt_dict_foreach(container->children, cursor2, child2_name, child2) {
- if (graph_extraction_filter_out (child2, child1)) continue;
- XBT_DEBUG ("get_route from %s to %s", child1_name, child2_name);
+ //if child2 is not a link, a smpi node, a msg process, a msg vm or a msg task
+ if (child2->kind == INSTR_LINK || child2->kind == INSTR_SMPI || child2->kind == INSTR_MSG_PROCESS || child2->kind == INSTR_MSG_VM || 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);
PJ_type_link_new ("MSG_PROCESS_TASK_LINK", PJ_type_get_root(), msg_process, msg_process);
}
}
+
+ if (TRACE_msg_vm_is_enabled()) {
+ type_t msg_vm = PJ_type_get_or_null ("MSG_VM", new->type);
+ if (msg_vm == NULL){
+ msg_vm = PJ_type_container_new("MSG_VM", new->type);
+ type_t state = PJ_type_state_new ("MSG_VM_STATE", msg_vm);
+ PJ_value_new ("suspend", "1 0 1", state);
+ PJ_value_new ("sleep", "1 1 0", state);
+ PJ_value_new ("receive", "1 0 0", state);
+ PJ_value_new ("send", "0 0 1", state);
+ PJ_value_new ("task_execute", "0 1 1", state);
+ PJ_type_link_new ("MSG_VM_LINK", PJ_type_get_root(), msg_vm, msg_vm);
+ PJ_type_link_new ("MSG_VM_PROCESS_LINK", PJ_type_get_root(), msg_vm, msg_vm);
+ }
+ }
+
}
static void instr_routing_parse_start_router (sg_platf_router_cbarg_t router)
snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "p%s", new_typename);
PJ_type_variable_new (tnstr, color, root);
}
- if (!strcmp (root->name, "LINK")){
+ if (!strcmp (root->name, "MSG_VM")){
+ char tnstr[INSTR_DEFAULT_STR_SIZE];
+ snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "p%s", new_typename);
+ PJ_type_variable_new (tnstr, color, root);
+ }
+ if (!strcmp (root->name, "LINK")){
char tnstr[INSTR_DEFAULT_STR_SIZE];
snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "b%s", new_typename);
PJ_type_variable_new (tnstr, color, root);
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 child1 is not a link, a smpi node, a msg process, a msg vm or a msg task
+ if (child1->kind == INSTR_LINK || child1->kind == INSTR_SMPI || child1->kind == INSTR_MSG_PROCESS || child1->kind == INSTR_MSG_VM || child1->kind == INSTR_MSG_TASK) 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 (child2->kind == INSTR_LINK || child2->kind == INSTR_SMPI || child2->kind == INSTR_MSG_PROCESS || child2->kind == INSTR_MSG_VM || child2->kind == INSTR_MSG_TASK) continue;
//if child1 is not child2
if (strcmp (child1_name, child2_name) == 0) continue;