return ret;
}
-static type_t newContainerType (const char *typename, e_entity_types kind, type_t father)
+type_t newContainerType (const char *typename, e_entity_types kind, type_t father)
{
type_t ret = newType (typename, kind, father);
// if (father) INFO4("ContainerType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
return ret;
}
-static type_t newVariableType (const char *typename, e_entity_types kind, const char *color, type_t father)
+type_t newEventType (const char *typename, e_entity_types kind, const char *color, type_t father)
+{
+ type_t ret = newType (typename, kind, father);
+// INFO4("EventType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
+ if (color){
+ pajeDefineEventTypeWithColor (ret->id, ret->father->id, ret->name, color);
+ }else{
+ pajeDefineEventType(ret->id, ret->father->id, ret->name);
+ }
+ return ret;
+}
+
+type_t newVariableType (const char *typename, e_entity_types kind, const char *color, type_t father)
{
type_t ret = newType (typename, kind, father);
// INFO4("VariableType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
return ret;
}
-static type_t newLinkType (const char *typename, e_entity_types kind, type_t father, type_t source, type_t dest)
+type_t newLinkType (const char *typename, e_entity_types kind, type_t father, type_t source, type_t dest)
{
type_t ret = newType (typename, kind, father);
// INFO8("LinkType %s(%s), child of %s(%s) %s(%s)->%s(%s)", ret->name, ret->id, father->name, father->id, source->name, source->id, dest->name, dest->id);
return ret;
}
-static type_t newStateType (const char *typename, e_entity_types kind, type_t father)
+type_t newStateType (const char *typename, e_entity_types kind, type_t father)
{
type_t ret = newType (typename, kind, father);
// INFO4("StateType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
return ret;
}
+static type_t getEventType (const char *typename, const char *color, type_t father)
+{
+ type_t ret = xbt_dict_get_or_null (father->children, typename);
+ if (ret == NULL){
+ ret = newEventType (typename, TYPE_EVENT, color, father);
+ }
+ return ret;
+}
+
static type_t getVariableType (const char *typename, const char *color, type_t father)
{
type_t ret = xbt_dict_get_or_null (father->children, typename);
case INSTR_LINK: new->type = getContainerType ("LINK", new->father->type); break;
case INSTR_ROUTER: new->type = getContainerType ("ROUTER", new->father->type); break;
case INSTR_SMPI: new->type = getContainerType ("MPI", new->father->type); break;
+ case INSTR_MSG_PROCESS: new->type = getContainerType ("MSG_PROCESS", new->father->type); break;
+ case INSTR_MSG_TASK: new->type = getContainerType ("MSG_TASK", new->father->type); break;
default: xbt_die ("Congratulations, you have found a bug on newContainer function of instr_routing.c"); break;
}
}
(child2->kind == INSTR_HOST || child2->kind == INSTR_ROUTER)){
//getting route
- xbt_dynar_t route;
+ xbt_dynar_t route = NULL;
xbt_ex_t exception;
TRY {
route = global_routing->get_route (child_name1, child_name2);
//getting route
routing_component_t root = global_routing->root;
- route_extended_t route;
+ route_extended_t route = NULL;
xbt_ex_t exception;
TRY {
route = root->get_route (root, child_name1, child_name2);
getLinkType ("MPI_LINK", rootType, mpi, mpi);
}
}
+
+ if (TRACE_msg_process_is_enabled()) {
+ type_t msg_process = getContainerType("MSG_PROCESS", new->type);
+ getStateType ("MSG_PROCESS_STATE", msg_process);
+ getLinkType ("MSG_PROCESS_LINK", rootType, 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);
+ getLinkType ("MSG_TASK_LINK", rootType, msg_task, msg_task);
+ }
}
static void instr_routing_parse_end_host ()