XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje, instr, "Paje tracing event system (data structures)");
-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_dict_t trivaNodeTypes = NULL; /* all link types defined */
xbt_dict_t trivaEdgeTypes = NULL; /* all host types defined */
-void instr_paje_init (void)
+long long int instr_new_paje_id (void)
{
- allContainers = xbt_dict_new_homogeneous(NULL);
- trivaNodeTypes = xbt_dict_new_homogeneous(xbt_free);
- trivaEdgeTypes = xbt_dict_new_homogeneous(xbt_free);
+ static long long int type_id = 0;
+ return type_id++;
}
-void instr_paje_set_root (container_t root)
+void PJ_container_alloc (void)
{
- rootContainer = root;
+ allContainers = xbt_dict_new_homogeneous(NULL);
+ trivaNodeTypes = xbt_dict_new_homogeneous(xbt_free);
+ trivaEdgeTypes = xbt_dict_new_homogeneous(xbt_free);
}
-void instr_paje_free (void)
+void PJ_container_release (void)
{
xbt_dict_free (&allContainers);
xbt_dict_free (&trivaNodeTypes);
xbt_dict_free (&trivaEdgeTypes);
}
-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)
+void PJ_container_set_root (container_t root)
{
- 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_homogeneous(NULL);
- ret->values = xbt_dict_new_homogeneous(NULL);
- 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);
-
- 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 getRootType ()
-{
- return rootType;
-}
-
-type_t getContainerType (const char *typename, type_t father)
-{
- type_t ret;
- if (father == NULL){
- 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, NULL, TYPE_CONTAINER, father);
- new_pajeDefineContainerType (ret);
- }
- }
- return ret;
-}
-
-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){
- char white[INSTR_DEFAULT_STR_SIZE] = "1 1 1";
- if (!color){
- ret = newType (typename, typename, white, TYPE_EVENT, father);
- }else{
- 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 getVariableType (const char *typename, const char *color, type_t father)
-{
- type_t ret = xbt_dict_get_or_null (father->children, typename);
- if (ret == NULL){
- char white[INSTR_DEFAULT_STR_SIZE] = "1 1 1";
- if (!color){
- ret = newType (typename, typename, white, TYPE_VARIABLE, father);
- }else{
- 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;
-}
-
-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)
-{
- 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, 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 getStateType (const char *typename, type_t father)
-{
- type_t ret = xbt_dict_get_or_null (father->children, typename);
- if (ret == NULL){
- 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;
+ rootContainer = root;
}
-container_t newContainer (const char *name, e_container_types kind, container_t father)
+container_t PJ_container_new (const char *name, e_container_types kind, container_t father)
{
static long long int container_id = 0;
char id_str[INSTR_DEFAULT_STR_SIZE];
char as_typename[INSTR_DEFAULT_STR_SIZE];
snprintf (as_typename, INSTR_DEFAULT_STR_SIZE, "L%d", new->level);
if (new->father){
- new->type = getContainerType (as_typename, new->father->type);
+ new->type = PJ_type_get (as_typename, new->father->type);
+ if (new->type == NULL){
+ new->type = PJ_type_container_new (as_typename, new->father->type);
+ }
}else{
- new->type = getContainerType ("0", NULL);
+ new->type = PJ_type_container_new ("0", NULL);
}
}else{
//otherwise, the name is its kind
+ char typename[INSTR_DEFAULT_STR_SIZE];
switch (new->kind){
- case INSTR_HOST: new->type = getContainerType ("HOST", new->father->type); break;
- 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;
+ case INSTR_HOST: snprintf (typename, INSTR_DEFAULT_STR_SIZE, "HOST"); break;
+ case INSTR_LINK: snprintf (typename, INSTR_DEFAULT_STR_SIZE, "LINK"); break;
+ case INSTR_ROUTER: snprintf (typename, INSTR_DEFAULT_STR_SIZE, "ROUTER"); break;
+ case INSTR_SMPI: snprintf (typename, INSTR_DEFAULT_STR_SIZE, "MPI"); break;
+ case INSTR_MSG_PROCESS: snprintf (typename, INSTR_DEFAULT_STR_SIZE, "MSG_PROCESS"); break;
+ case INSTR_MSG_TASK: snprintf (typename, INSTR_DEFAULT_STR_SIZE, "MSG_TASK"); break;
default: xbt_die ("Congratulations, you have found a bug on newContainer function of instr_routing.c"); break;
}
+ type_t type = PJ_type_get (typename, new->father->type);
+ if (type == NULL){
+ new->type = PJ_type_container_new (typename, new->father->type);
+ }else{
+ new->type = type;
+ }
}
new->children = xbt_dict_new_homogeneous(NULL);
if (new->father){
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 all kinds by name
+ if (xbt_dict_get_or_null(allContainers, new->name) != NULL){
+ THROWF(tracing_error, 1, "container %s already present in allContainers data structure", new->name);
+ }
+ xbt_dict_set (allContainers, new->name, new, NULL);
- //register NODE types for triva configuration
+ //register NODE types for triva configuration
+ if (new->kind == INSTR_HOST || new->kind == INSTR_LINK || new->kind == INSTR_ROUTER) {
xbt_dict_set (trivaNodeTypes, new->type->name, xbt_strdup("1"), NULL);
}
return new;
}
-static container_t recursiveGetContainer (const char *name, container_t root)
+container_t PJ_container_get (const char *name)
{
- if (name == NULL || root == NULL) return NULL;
- if (strcmp (root->name, name) == 0) return root;
-
- xbt_dict_cursor_t cursor = NULL;
- container_t child;
- char *child_name;
- xbt_dict_foreach(root->children, cursor, child_name, child) {
- container_t ret = recursiveGetContainer(name, child);
- if (ret) return ret;
+ container_t ret = PJ_container_get_or_null (name);
+ if (ret == NULL){
+ THROWF(tracing_error, 1, "container with name %s not found", name);
}
- return NULL;
+ return ret;
}
-container_t getContainer (const char *name)
+container_t PJ_container_get_or_null (const char *name)
{
if (name == NULL) return NULL;
- return getContainerByName(name);
-}
-
-int knownContainerWithName (const char *name)
-{
- if (xbt_dict_get_or_null (allContainers, name) == NULL){
- return 0;
- }else{
- return 1;
- }
-}
-
-container_t getContainerByName (const char *name)
-{
container_t ret = xbt_dict_get_or_null (allContainers, name);
if (ret == NULL){
- XBT_CRITICAL("container with name %s not found", name);
+ return NULL;
}
return ret;
}
-char *getContainerIdByName (const char *name)
-{
- return getContainerByName(name)->id;
-}
-
-container_t getRootContainer ()
+container_t PJ_container_get_root ()
{
return rootContainer;
}
-static type_t recursiveGetType (const char *name, type_t root)
-{
- if (strcmp (root->name, name) == 0) return root;
-
- xbt_dict_cursor_t cursor = NULL;
- type_t child;
- char *child_name;
- type_t ret = NULL;
- xbt_dict_foreach(root->children, cursor, child_name, child) {
- type_t found = recursiveGetType(name, child);
- if (found){
- if (ret == NULL){
- ret = found;
- }else{
- XBT_CRITICAL("[tracing] found two types with the same name");
- }
- }
- }
- return ret;
-}
-
-type_t getType (const char *name, type_t father)
-{
- return recursiveGetType (name, father);
-}
-
-void removeContainerFromParent (container_t child)
+void PJ_container_remove_from_parent (container_t child)
{
container_t parent = child->father;
if (parent){
}
}
-void destroyContainer (container_t container)
+void PJ_container_free (container_t container)
{
XBT_DEBUG("destroy container %s", container->name);
xbt_dict_foreach(container->children, cursor, child_name, child) {
recursiveDestroyContainer (child);
}
- destroyContainer (container);
+ PJ_container_free (container);
}
-static void recursiveDestroyType (type_t type)
+void PJ_container_free_all ()
{
- XBT_DEBUG("recursiveDestroyType %s", type->name);
- 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->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;
-}
-
-void destroyAllContainers ()
-{
- if (getRootContainer()) recursiveDestroyContainer (getRootContainer());
- if (getRootType()) recursiveDestroyType (getRootType());
+ if (PJ_container_get_root()) recursiveDestroyContainer (PJ_container_get_root());
rootContainer = NULL;
- rootType = NULL;
//checks
if (xbt_dict_length(allContainers) != 0){
- XBT_CRITICAL("some containers still present even after destroying all of them");
+ THROWF(tracing_error, 0, "some containers still present even after destroying all of them");
}
}
-
#endif /* HAVE_TRACING */
