return counter++;
}
-static type_t newType (const char *typename, const char *key, e_entity_types kind, type_t father)
+static type_t newType (const char *typename, const char *key, const char *color, e_entity_types kind, type_t father)
{
type_t ret = xbt_new0(s_type_t, 1);
ret->name = xbt_strdup (typename);
ret->father = father;
ret->kind = kind;
ret->children = xbt_dict_new ();
+ ret->color = xbt_strdup (color);
long long int id = newTypeId();
char str_id[INSTR_DEFAULT_STR_SIZE];
{
type_t ret;
if (father == NULL){
- ret = newType (typename, typename, TYPE_CONTAINER, father);
- if (father) pajeDefineContainerType(ret->id, ret->father->id, ret->name);
+ ret = newType (typename, typename, NULL, TYPE_CONTAINER, father);
+ if (father) new_pajeDefineContainerType (ret);
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 = newType (typename, typename, TYPE_CONTAINER, father);
- pajeDefineContainerType(ret->id, ret->father->id, ret->name);
+ ret = newType (typename, typename, NULL, TYPE_CONTAINER, father);
+ new_pajeDefineContainerType (ret);
}
}
return ret;
{
type_t ret = xbt_dict_get_or_null (father->children, typename);
if (ret == NULL){
- 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);
+ char white[INSTR_DEFAULT_STR_SIZE] = "1 1 1";
+ if (!color){
+ ret = newType (typename, typename, white, TYPE_EVENT, father);
}else{
- pajeDefineEventType(ret->id, ret->father->id, ret->name);
+ ret = newType (typename, typename, color, TYPE_EVENT, father);
}
+ //INFO4("EventType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
+ new_pajeDefineEventType(ret);
}
return ret;
}
{
type_t ret = xbt_dict_get_or_null (father->children, typename);
if (ret == NULL){
- 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);
+ char white[INSTR_DEFAULT_STR_SIZE] = "1 1 1";
+ if (!color){
+ ret = newType (typename, typename, white, TYPE_VARIABLE, father);
}else{
- pajeDefineVariableType(ret->id, ret->father->id, ret->name);
+ ret = newType (typename, typename, color, TYPE_VARIABLE, father);
}
+ //INFO4("VariableType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
+ new_pajeDefineVariableType (ret);
}
return ret;
}
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);
+ ret = newType (typename, key, NULL, 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);
+ new_pajeDefineLinkType(ret, source, dest);
}
return ret;
}
{
type_t ret = xbt_dict_get_or_null (father->children, typename);
if (ret == NULL){
- ret = newType (typename, typename, TYPE_STATE, father);
+ ret = newType (typename, typename, NULL, 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);
+ new_pajeDefineStateType(ret);
}
return ret;
}
new->children = xbt_dict_new();
if (new->father){
xbt_dict_set(new->father->children, new->name, new, NULL);
- pajeCreateContainer (SIMIX_get_clock(), new->id, new->type->id, new->father->id, new->name);
+ new_pajeCreateContainer (new);
}
//register hosts, routers, links containers
}
//trace my destruction
- pajeDestroyContainer(SIMIX_get_clock(), container->type->id, container->id);
+ new_pajeDestroyContainer(container);
//free
xbt_free (container->name);