static type_t rootType = NULL; /* the root type */
static container_t rootContainer = NULL; /* the root container */
static xbt_dict_t allContainers = NULL; /* all created containers indexed by name */
-xbt_dynar_t allLinkTypes = NULL; /* all link types defined */
-xbt_dynar_t allHostTypes = NULL; /* all host types defined */
+xbt_dict_t trivaNodeTypes = NULL; /* all link types defined */
+xbt_dict_t trivaEdgeTypes = NULL; /* all host types defined */
void instr_paje_init (container_t root)
{
allContainers = xbt_dict_new ();
- allLinkTypes = xbt_dynar_new (sizeof(s_type_t), NULL);
- allHostTypes = xbt_dynar_new (sizeof(s_type_t), NULL);
+ trivaNodeTypes = xbt_dict_new ();
+ trivaEdgeTypes = xbt_dict_new ();
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 type_t newType (const char *typename, const char *key, e_entity_types kind, type_t father)
+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);
+ DEBUG2("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);
+ DEBUG4("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->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);
}
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);
}
+ DEBUG4("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);
}
+ DEBUG4("VariableType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
+ new_pajeDefineVariableType (ret);
}
return ret;
}
+char *getVariableTypeIdByName (const char *name, type_t father)
+{
+ xbt_dict_cursor_t cursor = NULL;
+ type_t type;
+ char *key;
+ xbt_dict_foreach(father->children, cursor, key, type) {
+ if (strcmp (name, type->name) == 0) return type->id;
+ }
+ return NULL;
+}
+
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);
+ 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);
+ 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);
+ DEBUG4("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);
}else{
new->level = 0;
}
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
if (new->kind == INSTR_HOST || new->kind == INSTR_LINK || new->kind == INSTR_ROUTER) {
xbt_dict_set (allContainers, new->name, new, NULL);
- }
- //register the host container types
- if (new->kind == INSTR_HOST){
- xbt_dynar_push_as (allHostTypes, type_t, new->type);
- }
-
- //register the link container types
- if (new->kind == INSTR_LINK){
- xbt_dynar_push_as(allLinkTypes, type_t, new->type);
+ //register NODE types for triva configuration
+ xbt_dict_set (trivaNodeTypes, new->type->name, xbt_strdup("1"), xbt_free);
}
return new;
}
container_t getContainerByName (const char *name)
{
- return (container_t)xbt_dict_get (allContainers, name);
+ return (container_t)xbt_dict_get_or_null (allContainers, name);
+}
+
+char *getContainerIdByName (const char *name)
+{
+ return getContainerByName(name)->id;
}
container_t getRootContainer ()
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);
+
+ //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);
+ new_pajeDestroyContainer(container);
//free
xbt_free (container->name);
container = NULL;
}
+static void recursiveDestroyContainer (container_t container)
+{
+ xbt_dict_cursor_t cursor = NULL;
+ container_t child;
+ char *child_name;
+ xbt_dict_foreach(container->children, cursor, child_name, child) {
+ recursiveDestroyContainer (child);
+ }
+ destroyContainer (container);
+}
+
+static void recursiveDestroyType (type_t type)
+{
+ xbt_dict_cursor_t cursor = NULL;
+ type_t child;
+ char *child_name;
+ xbt_dict_foreach(type->children, cursor, child_name, child) {
+ recursiveDestroyType (child);
+ }
+ xbt_free (type->name);
+ xbt_free (type->id);
+ xbt_free (type->children);
+ xbt_free (type->values);
+ xbt_free (type);
+ type = NULL;
+}
+
+void destroyAllContainers ()
+{
+ if (getRootContainer()) recursiveDestroyContainer (getRootContainer());
+ if (getRootType()) recursiveDestroyType (getRootType());
+ rootContainer = NULL;
+ rootType = NULL;
+}
+
#endif /* HAVE_TRACING */
