rootContainer = root;
}
-static long long int newTypeId ()
+static long long int new_type_id (void)
{
- static long long int counter = 0;
- return counter++;
+ static long long int type_id = 0;
+ return type_id++;
+}
+
+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)
ret->father = father;
ret->kind = kind;
ret->children = xbt_dict_new ();
+ ret->values = xbt_dict_new ();
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);
- DEBUG2("new type %s, child of %s", typename, father->name);
+ XBT_DEBUG("new type %s, child of %s", typename, father->name);
}
return ret;
}
}else{
ret = newType (typename, typename, color, TYPE_EVENT, father);
}
- DEBUG4("EventType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
+ XBT_DEBUG("EventType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
new_pajeDefineEventType(ret);
}
return ret;
}else{
ret = newType (typename, typename, color, TYPE_VARIABLE, father);
}
- DEBUG4("VariableType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
+ XBT_DEBUG("VariableType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
new_pajeDefineVariableType (ret);
}
return ret;
type_t ret = xbt_dict_get_or_null (father->children, key);
if (ret == NULL){
ret = newType (typename, key, NULL, TYPE_LINK, father);
- DEBUG8("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);
+ 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, NULL, TYPE_STATE, father);
- DEBUG4("StateType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
+ 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;
- DEBUG2("new container %s, child of %s", name, father->name);
+ XBT_DEBUG("new container %s, child of %s", name, father->name);
}else{
new->level = 0;
}
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)
xbt_dict_remove(container->father->children, container->name);
}
- DEBUG1("destroy container %s", container->name);
-
- //trace my destruction
- new_pajeDestroyContainer(container);
+ 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(0);
+ TRACE_paje_dump_buffer(1);
+
+ //trace my destruction
+ if (!TRACE_disable_destroy()){
+ //do not trace the container destruction if user requests
+ new_pajeDestroyContainer(container);
+ }
//free
xbt_free (container->name);
xbt_free (type->name);
xbt_free (type->id);
xbt_free (type->children);
+ xbt_free (type->values);
xbt_free (type);
type = NULL;
}