void instr_paje_init (container_t root)
{
- allContainers = xbt_dict_new ();
- trivaNodeTypes = xbt_dict_new ();
- trivaEdgeTypes = xbt_dict_new ();
+ allContainers = xbt_dict_new_homogeneous(NULL);
+ trivaNodeTypes = xbt_dict_new_homogeneous(xbt_free);
+ trivaEdgeTypes = xbt_dict_new_homogeneous(xbt_free);
rootContainer = root;
}
-static long long int newTypeId ()
+void instr_paje_free (void)
{
- static long long int counter = 0;
- return counter++;
+ xbt_dict_free (&allContainers);
+ xbt_dict_free (&trivaNodeTypes);
+ xbt_dict_free (&trivaEdgeTypes);
}
-static type_t newType (const char *typename, const char *key, e_entity_types kind, type_t father)
+static long long int new_type_id (void)
+{
+ static long long int type_id = 0;
+ return type_id++;
+}
+
+static void destroyValue (void *value)
+{
+ xbt_free(((val_t)value)->name);
+ xbt_free(((val_t)value)->color);
+ xbt_free(((val_t)value)->id);
+ xbt_free(value);
+}
+
+static val_t newValue (const char *valuename, const char *color, type_t father)
+{
+ val_t ret = xbt_new0(s_val_t, 1);
+ ret->name = xbt_strdup (valuename);
+ ret->father = father;
+ ret->color = xbt_strdup (color);
+
+ char str_id[INSTR_DEFAULT_STR_SIZE];
+ snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "%lld", new_type_id());
+ ret->id = xbt_strdup (str_id);
+
+ xbt_dict_set (father->values, valuename, ret, NULL);
+ XBT_DEBUG("new value %s, child of %s", ret->name, ret->father->name);
+ return ret;
+}
+
+val_t getValue (const char *valuename, const char *color, type_t father)
+{
+ if (father->kind == TYPE_VARIABLE) return NULL; //Variables can't have different values
+
+ val_t ret = (val_t)xbt_dict_get_or_null (father->values, valuename);
+ if (ret == NULL){
+ ret = newValue (valuename, color, father);
+ XBT_DEBUG("EntityValue %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
+ new_pajeDefineEntityValue(ret);
+ }
+ return ret;
+}
+
+val_t getValueByName (const char *valuename, type_t father)
+{
+ return getValue (valuename, NULL, 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->children = xbt_dict_new_homogeneous(NULL);
+ ret->values = xbt_dict_new_homogeneous(NULL);
+ ret->color = xbt_strdup (color);
- long long int id = newTypeId();
char str_id[INSTR_DEFAULT_STR_SIZE];
- snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "%lld", id);
+ snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "%lld", new_type_id());
ret->id = xbt_strdup (str_id);
if (father != NULL){
xbt_dict_set (father->children, key, ret, NULL);
+ XBT_DEBUG("new type %s, child of %s", typename, father->name);
}
return ret;
}
{
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);
}
+ XBT_DEBUG("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);
}
+ XBT_DEBUG("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);
- //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);
+ ret = newType (typename, key, NULL, TYPE_LINK, father);
+ XBT_DEBUG("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);
+ 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);
- //INFO4("StateType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
- pajeDefineStateType(ret->id, ret->father->id, ret->name);
+ ret = newType (typename, typename, NULL, TYPE_STATE, father);
+ XBT_DEBUG("StateType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
+ new_pajeDefineStateType(ret);
}
return ret;
}
-
-static long long int newContainedId ()
-{
- static long long counter = 0;
- return counter++;
-}
-
container_t newContainer (const char *name, e_container_types kind, container_t father)
{
- long long int counter = newContainedId();
+ static long long int container_id = 0;
char id_str[INSTR_DEFAULT_STR_SIZE];
- snprintf (id_str, INSTR_DEFAULT_STR_SIZE, "%lld", counter);
+ snprintf (id_str, INSTR_DEFAULT_STR_SIZE, "%lld", container_id++);
container_t new = xbt_new0(s_container_t, 1);
new->name = xbt_strdup (name); // name of the container
// level depends on level of father
if (new->father){
new->level = new->father->level+1;
+ XBT_DEBUG("new container %s, child of %s", name, father->name);
}else{
new->level = 0;
}
default: xbt_die ("Congratulations, you have found a bug on newContainer function of instr_routing.c"); break;
}
}
- new->children = xbt_dict_new();
+ new->children = xbt_dict_new_homogeneous(NULL);
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
xbt_dict_set (allContainers, new->name, new, NULL);
//register NODE types for triva configuration
- xbt_dict_set (trivaNodeTypes, new->type->name, xbt_strdup("1"), xbt_free);
+ xbt_dict_set (trivaNodeTypes, new->type->name, xbt_strdup("1"), NULL);
}
return new;
}
static container_t recursiveGetContainer (const char *name, container_t root)
{
+ if (name == NULL || root == NULL) return NULL;
if (strcmp (root->name, name) == 0) return root;
xbt_dict_cursor_t cursor = NULL;
container_t getContainer (const char *name)
{
+ if (name == NULL) return NULL;
return recursiveGetContainer(name, rootContainer);
}
+int knownContainerWithName (const char *name)
+{
+ if (xbt_dict_get_or_null (allContainers, name)){
+ return 1;
+ }else{
+ return 0;
+ }
+}
+
container_t getContainerByName (const char *name)
{
return (container_t)xbt_dict_get (allContainers, name);
return NULL;
}
-type_t getType (const char *name)
+type_t getType (const char *name, type_t father)
{
- return recursiveGetType (name, rootType);
+ return recursiveGetType (name, father);
}
void destroyContainer (container_t container)
{
- //remove me from my father
- if (container->father){
- xbt_dict_remove(container->father->children, container->name);
- }
+ XBT_DEBUG("destroy container %s", container->name);
+
+ //obligation to dump previous events because they might
+ //reference the container that is about to be destroyed
+ TRACE_last_timestamp_to_dump = surf_get_clock();
+ TRACE_paje_dump_buffer(1);
//trace my destruction
- pajeDestroyContainer(SIMIX_get_clock(), container->type->id, container->id);
+ if (!TRACE_disable_destroy()){
+ //do not trace the container destruction if user requests
+ new_pajeDestroyContainer(container);
+ }
//free
xbt_free (container->name);
xbt_free (container->id);
- xbt_free (container->children);
+ xbt_dict_free (&container->children);
xbt_free (container);
container = NULL;
}
}
xbt_free (type->name);
xbt_free (type->id);
- xbt_free (type->children);
+ xbt_free (type->color);
+ xbt_dict_free (&type->children);
+ val_t value;
+ char *value_name;
+ xbt_dict_foreach(type->values, cursor, value_name, value) {
+ destroyValue (value);
+ }
+ xbt_dict_free (&type->values);
xbt_free (type);
type = NULL;
}
