return counter++;
}
-static type_t newType (const char *typename, e_entity_types kind, type_t father)
+static type_t newType (const char *typename, const char *key, e_entity_types kind, type_t father)
{
type_t ret = xbt_new0(s_type_t, 1);
ret->name = xbt_strdup (typename);
ret->id = xbt_strdup (str_id);
if (father != NULL){
- xbt_dict_set (father->children, typename, ret, NULL);
+ xbt_dict_set (father->children, key, ret, NULL);
}
return ret;
}
-static 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);
- if (father) pajeDefineContainerType(ret->id, ret->father->id, ret->name);
- return ret;
-}
-
-static 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);
- if (color){
- pajeDefineVariableTypeWithColor(ret->id, ret->father->id, ret->name, color);
- }else{
- pajeDefineVariableType(ret->id, ret->father->id, ret->name);
- }
- return ret;
-}
-
-static 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);
- pajeDefineLinkType(ret->id, ret->father->id, source->id, dest->id, ret->name);
- return ret;
-}
-
-static 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);
- pajeDefineStateType(ret->id, ret->father->id, ret->name);
- return ret;
-}
-
-static type_t getContainerType (const char *typename, type_t father)
+type_t getContainerType (const char *typename, type_t father)
{
type_t ret;
if (father == NULL){
- ret = newContainerType (typename, TYPE_CONTAINER, father);
+ ret = newType (typename, typename, TYPE_CONTAINER, father);
+ if (father) pajeDefineContainerType(ret->id, ret->father->id, ret->name);
rootType = ret;
}else{
//check if my father type already has my typename
ret = (type_t)xbt_dict_get_or_null (father->children, typename);
if (ret == NULL){
- ret = newContainerType (typename, TYPE_CONTAINER, father);
+ ret = newType (typename, typename, TYPE_CONTAINER, father);
+ pajeDefineContainerType(ret->id, ret->father->id, ret->name);
}
}
return ret;
}
-static type_t getVariableType (const char *typename, const char *color, type_t father)
+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 = newVariableType (typename, TYPE_VARIABLE, color, father);
+ ret = newType (typename, typename, TYPE_EVENT, 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;
}
-static type_t getLinkType (const char *typename, type_t father, type_t source, type_t dest)
+type_t getVariableType (const char *typename, const char *color, type_t father)
{
type_t ret = xbt_dict_get_or_null (father->children, typename);
if (ret == NULL){
- ret = newLinkType (typename, TYPE_LINK, father, source, dest);
+ ret = newType (typename, typename, TYPE_VARIABLE, father);
+ //INFO4("VariableType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
+ if (color){
+ pajeDefineVariableTypeWithColor(ret->id, ret->father->id, ret->name, color);
+ }else{
+ pajeDefineVariableType(ret->id, ret->father->id, ret->name);
+ }
+ }
+ return ret;
+}
+
+type_t getLinkType (const char *typename, type_t father, type_t source, type_t dest)
+{
+ //FIXME should check using source and dest here and not by the typename (g5k example)
+ char key[INSTR_DEFAULT_STR_SIZE];
+ snprintf (key, INSTR_DEFAULT_STR_SIZE, "%s-%s-%s", typename, source->id, dest->id);
+ type_t ret = xbt_dict_get_or_null (father->children, key);
+ if (ret == NULL){
+ ret = newType (typename, key, TYPE_LINK, 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);
+ pajeDefineLinkType(ret->id, ret->father->id, source->id, dest->id, ret->name);
}
return ret;
}
-static type_t getStateType (const char *typename, type_t father)
+type_t getStateType (const char *typename, type_t father)
{
type_t ret = xbt_dict_get_or_null (father->children, typename);
if (ret == NULL){
- ret = newStateType (typename, TYPE_STATE, father);
+ ret = newType (typename, typename, TYPE_STATE, father);
+ //INFO4("StateType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
+ pajeDefineStateType(ret->id, ret->father->id, ret->name);
}
return ret;
}
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);
static void instr_routing_parse_start_AS ()
{
if (rootContainer == NULL){
- currentContainer = xbt_dynar_new (sizeof(s_container_t), NULL);
+ currentContainer = xbt_dynar_new (sizeof(container_t), NULL);
allContainers = xbt_dict_new ();
allLinkTypes = xbt_dynar_new (sizeof(s_type_t), NULL);
allHostTypes = xbt_dynar_new (sizeof(s_type_t), NULL);
rootContainer = newContainer ("0", INSTR_AS, NULL);
- xbt_dynar_push (currentContainer, rootContainer);
+ xbt_dynar_push (currentContainer, &rootContainer);
if (TRACE_smpi_is_enabled()) {
if (!TRACE_smpi_is_grouped()){
- container_t father = xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+ container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
type_t mpi = getContainerType("MPI", father->type);
getStateType ("MPI_STATE", mpi);
getLinkType ("MPI_LINK", rootType, mpi, mpi);
}
}
}
- container_t father = xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+ 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);
//push
- xbt_dynar_push (currentContainer, new);
+ xbt_dynar_push (currentContainer, &new);
}
static void instr_routing_parse_end_AS ()
static void instr_routing_parse_start_link ()
{
- container_t father = xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+ 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);
type_t bandwidth = getVariableType ("bandwidth", NULL, new->type);
static void instr_routing_parse_start_host ()
{
- container_t father = xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+ container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
container_t new = newContainer (A_surfxml_host_id, INSTR_HOST, father);
type_t power = getVariableType ("power", NULL, new->type);
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 ()
static void instr_routing_parse_start_router ()
{
- container_t father = xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+ container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
newContainer (A_surfxml_router_id, INSTR_ROUTER, father);
}
static void instr_routing_parse_end_platform ()
{
+ xbt_dynar_free(¤tContainer);
currentContainer = NULL;
recursiveGraphExtraction (rootContainer);
platform_created = 1;