extern xbt_dict_t defined_types; /* from instr_interface.c */
-typedef enum {
- TYPE_VARIABLE,
- TYPE_LINK,
- TYPE_CONTAINER,
-} e_entity_types;
-
-typedef struct s_type *type_t;
-typedef struct s_type {
- char *id;
- char *name;
- e_entity_types kind;
- struct s_type *father;
- xbt_dict_t children;
-}s_type_t;
-
-typedef enum {
- INSTR_HOST,
- INSTR_LINK,
- INSTR_ROUTER,
- INSTR_AS,
-} e_container_types;
-
-typedef struct s_container *container_t;
-typedef struct s_container {
- char *name; /* Unique name of this container */
- char *id; /* Unique id of this container */
- type_t type; /* Type of this container */
- int level; /* Level in the hierarchy, root level is 0 */
- e_container_types kind; /* This container is of what kind */
- struct s_container *father;
- xbt_dict_t children;
-}s_container_t;
-
static int platform_created = 0; /* indicate whether the platform file has been traced */
-static type_t rootType = NULL; /* the root type */
-static container_t rootContainer = NULL; /* the root container */
static xbt_dynar_t currentContainer = NULL; /* push and pop, used only in creation */
-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 */
-
-static void instr_routing_parse_start_AS (void);
-static void instr_routing_parse_end_AS (void);
-static void instr_routing_parse_start_link (void);
-static void instr_routing_parse_end_link (void);
-static void instr_routing_parse_start_host (void);
-static void instr_routing_parse_end_host (void);
-static void instr_routing_parse_start_router (void);
-static void instr_routing_parse_end_router (void);
-static void instr_routing_parse_end_platform (void);
-
-static long long int newTypeId ()
-{
- static long long int counter = 0;
- return counter++;
-}
-
-static type_t newType (const char *typename, 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 ();
-
- long long int id = newTypeId();
- char str_id[INSTR_DEFAULT_STR_SIZE];
- snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "%lld", id);
- ret->id = xbt_strdup (str_id);
-
- if (father != NULL){
- xbt_dict_set (father->children, typename, ret, NULL);
- }
- return ret;
-}
-
-static type_t newContainerType (const char *typename, e_entity_types kind, type_t father)
-{
- type_t ret = newType (typename, kind, father);
-// if (father) INFO4("ContainerType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
- if (father) pajeDefineContainerType(ret->id, ret->father->id, ret->name);
- return ret;
-}
-
-static type_t newVariableType (const char *typename, e_entity_types kind, const char *color, type_t father)
-{
- type_t ret = newType (typename, kind, 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);
- }else{
- pajeDefineVariableType(ret->id, ret->father->id, ret->name);
- }
- return ret;
-}
-
-static type_t newLinkType (const char *typename, e_entity_types kind, type_t father, type_t source, type_t dest)
-{
- type_t ret = newType (typename, kind, 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);
- return ret;
-}
-
-static type_t getContainerType (const char *typename, type_t father)
-{
- type_t ret;
- if (father == NULL){
- ret = newContainerType (typename, TYPE_CONTAINER, father);
- 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 = newContainerType (typename, TYPE_CONTAINER, father);
- }
- }
- return ret;
-}
-
-static 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){
- ret = newVariableType (typename, TYPE_VARIABLE, color, father);
- }
- return ret;
-}
-
-static type_t getLinkType (const char *typename, type_t father, type_t source, type_t dest)
-{
- type_t ret = xbt_dict_get_or_null (father->children, typename);
- if (ret == NULL){
- ret = newLinkType (typename, TYPE_LINK, father, source, dest);
- }
- return ret;
-}
-
-void instr_routing_define_callbacks ()
-{
- if (!TRACE_is_active())
- return;
- surfxml_add_callback(STag_surfxml_AS_cb_list, &instr_routing_parse_start_AS);
- surfxml_add_callback(ETag_surfxml_AS_cb_list, &instr_routing_parse_end_AS);
- surfxml_add_callback(STag_surfxml_link_cb_list, &instr_routing_parse_start_link);
- surfxml_add_callback(ETag_surfxml_link_cb_list, &instr_routing_parse_end_link);
- surfxml_add_callback(STag_surfxml_host_cb_list, &instr_routing_parse_start_host);
- surfxml_add_callback(ETag_surfxml_host_cb_list, &instr_routing_parse_end_host);
- surfxml_add_callback(STag_surfxml_router_cb_list, &instr_routing_parse_start_router);
- surfxml_add_callback(ETag_surfxml_router_cb_list, &instr_routing_parse_end_router);
- surfxml_add_callback(ETag_surfxml_platform_cb_list, &instr_routing_parse_end_platform);
-}
-
-static long long int newContainedId ()
-{
- static long long counter = 0;
- return counter++;
-}
-
-static container_t newContainer (const char *name, e_container_types kind, container_t father)
-{
- long long int counter = newContainedId();
- char id_str[INSTR_DEFAULT_STR_SIZE];
- snprintf (id_str, INSTR_DEFAULT_STR_SIZE, "%lld", counter);
-
- container_t new = xbt_new0(s_container_t, 1);
- new->name = xbt_strdup (name); // name of the container
- new->id = xbt_strdup (id_str); // id (or alias) of the container
- new->father = father;
- // father of this container
- if (new->father){
- new->father = xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
- }else{
- new->father = NULL;
- }
- // level depends on level of father
- if (new->father){
- new->level = new->father->level+1;
- }else{
- new->level = 0;
- }
- // type definition (method depends on kind of this new container)
- new->kind = kind;
- if (new->kind == INSTR_AS){
- //if this container is of an AS, its type name depends on its level
- 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);
- }else{
- new->type = getContainerType ("0", NULL);
- }
- }else{
- //otherwise, the name is its kind
- 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;
- default: xbt_die ("Congratulations, you have found a bug on newContainer function of instr_routing.c"); break;
- }
- }
- new->children = xbt_dict_new();
- if (new->father){
- xbt_dict_set(new->father->children, new->name, new, NULL);
- pajeCreateContainer (0, new->id, new->type->id, new->father->id, new->name);
- }
-
- //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);
- }
- return new;
-}
static container_t findChild (container_t root, container_t a1)
{
return NULL;
}
-static void linkContainers (const char *a1, const char *a2)
+static void linkContainers (const char *a1, const char *a2, xbt_dict_t filter)
{
//ignore loopback
if (strcmp (a1, "__loopback__") == 0 || strcmp (a2, "__loopback__") == 0)
return;
- container_t a1_container = ((container_t)xbt_dict_get (allContainers, a1));
+ //check if we already register this pair (we only need one direction)
+ char aux1[INSTR_DEFAULT_STR_SIZE], aux2[INSTR_DEFAULT_STR_SIZE];
+ snprintf (aux1, INSTR_DEFAULT_STR_SIZE, "%s%s", a1, a2);
+ snprintf (aux2, INSTR_DEFAULT_STR_SIZE, "%s%s", a2, a1);
+ if (xbt_dict_get_or_null (filter, aux1)) return;
+ if (xbt_dict_get_or_null (filter, aux2)) return;
+
+ //ok, not found, register it
+ xbt_dict_set (filter, aux1, xbt_strdup ("1"), xbt_free);
+ xbt_dict_set (filter, aux2, xbt_strdup ("1"), xbt_free);
+
+ container_t a1_container = getContainerByName (a1);
type_t a1_type = a1_container->type;
- container_t a2_container = ((container_t)xbt_dict_get (allContainers, a2));
+ container_t a2_container = getContainerByName (a2);
type_t a2_type = a2_container->type;
- container_t container = findCommonFather (rootContainer, a1_container, a2_container);
- xbt_assert0 (container != NULL, "common father not found");
+ container_t container = findCommonFather (getRootContainer(), a1_container, a2_container);
+ xbt_assert (container != NULL, "common father not found");
//declare type
char link_typename[INSTR_DEFAULT_STR_SIZE];
snprintf (link_typename, INSTR_DEFAULT_STR_SIZE, "%s-%s", a1_type->name, a2_type->name);
type_t link_type = getLinkType (link_typename, container->type, a1_type, a2_type);
+ //register EDGE types for triva configuration
+ xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), xbt_free);
+
//create the link
static long long counter = 0;
char key[INSTR_DEFAULT_STR_SIZE];
snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter++);
- pajeStartLink(SIMIX_get_clock(), link_type->id, container->id, "G", a1_container->id, key);
- pajeEndLink(SIMIX_get_clock(), link_type->id, container->id, "G", a2_container->id, key);
+ new_pajeStartLink(SIMIX_get_clock(), container, link_type, a1_container, "G", key);
+ new_pajeEndLink(SIMIX_get_clock(), container, link_type, a2_container, "G", key);
}
-static void recursiveGraphExtraction (container_t container)
+static void recursiveGraphExtraction (container_t container, xbt_dict_t filter)
{
if (xbt_dict_length(container->children)){
xbt_dict_cursor_t cursor = NULL;
char *child_name;
//bottom-up recursion
xbt_dict_foreach(container->children, cursor, child_name, child) {
- recursiveGraphExtraction (child);
+ recursiveGraphExtraction (child, filter);
}
//let's get routes
container_t child1, child2;
const char *child_name1, *child_name2;
- xbt_dict_t filter = xbt_dict_new ();
-
xbt_dict_foreach(container->children, cursor1, child_name1, child1) {
xbt_dict_foreach(container->children, cursor2, child_name2, child2) {
- //check if we already register this pair (we only need one direction)
- char aux1[INSTR_DEFAULT_STR_SIZE], aux2[INSTR_DEFAULT_STR_SIZE];
- snprintf (aux1, INSTR_DEFAULT_STR_SIZE, "%s%s", child_name1, child_name2);
- snprintf (aux2, INSTR_DEFAULT_STR_SIZE, "%s%s", child_name2, child_name1);
- if (xbt_dict_get_or_null (filter, aux1)) continue;
- if (xbt_dict_get_or_null (filter, aux2)) continue;
-
- //ok, not found, register it
- xbt_dict_set (filter, aux1, xbt_strdup ("1"), xbt_free);
- xbt_dict_set (filter, aux2, xbt_strdup ("1"), xbt_free);
-
if ((child1->kind == INSTR_HOST || child1->kind == INSTR_ROUTER) &&
(child2->kind == INSTR_HOST || child2->kind == INSTR_ROUTER)){
//getting route
- xbt_dynar_t route;
+ xbt_dynar_t route = NULL;
xbt_ex_t exception;
TRY {
route = global_routing->get_route (child_name1, child_name2);
char *previous_entity_name = (char*)child_name1;
xbt_dynar_foreach (route, cpt, link) {
char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
- linkContainers (previous_entity_name, link_name);
+ linkContainers (previous_entity_name, link_name, filter);
previous_entity_name = link_name;
}
- linkContainers (previous_entity_name, child_name2);
+ linkContainers (previous_entity_name, child_name2, filter);
}else if (child1->kind == INSTR_AS &&
child2->kind == INSTR_AS &&
strcmp(child_name1, child_name2) != 0){
//getting route
routing_component_t root = global_routing->root;
- route_extended_t route;
+ route_extended_t route = NULL;
xbt_ex_t exception;
TRY {
route = root->get_route (root, child_name1, child_name2);
//no route between them, that's possible
continue;
}
- xbt_assert2(route!=NULL,
+ xbt_assert(route!=NULL,
"there is no ASroute between %s and %s", child_name1, child_name2);
unsigned int cpt;
void *link;
char *previous_entity_name = route->src_gateway;
xbt_dynar_foreach (route->generic_route.link_list, cpt, link) {
char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
- linkContainers (previous_entity_name, link_name);
+ linkContainers (previous_entity_name, link_name, filter);
previous_entity_name = link_name;
}
- linkContainers (previous_entity_name, route->dst_gateway);
+ linkContainers (previous_entity_name, route->dst_gateway, filter);
}
}
}
- xbt_dict_free(&filter);
}
}
*/
static void instr_routing_parse_start_AS ()
{
- if (rootContainer == NULL){
- currentContainer = xbt_dynar_new (sizeof(s_container_t), NULL);
- allContainers = xbt_dict_new ();
- allLinkTypes = xbt_dynar_new (sizeof(s_type_t), NULL);
- allHostTypes = xbt_dynar_new (sizeof(s_type_t), NULL);
+ if (getRootContainer() == NULL){
+ container_t root = newContainer (A_surfxml_AS_id, INSTR_AS, NULL);
+ instr_paje_init (root);
- rootContainer = newContainer ("0", INSTR_AS, NULL);
- xbt_dynar_push (currentContainer, rootContainer);
+ currentContainer = xbt_dynar_new (sizeof(container_t), NULL);
+ xbt_dynar_push (currentContainer, &root);
+ if (TRACE_smpi_is_enabled()) {
+ if (!TRACE_smpi_is_grouped()){
+ container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+ type_t mpi = getContainerType("MPI", father->type);
+ getStateType ("MPI_STATE", mpi);
+ getLinkType ("MPI_LINK", getRootType(), mpi, mpi);
+ }
+ }
+
+ return;
}
- container_t father = xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+ container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
container_t new = newContainer (A_surfxml_AS_id, INSTR_AS, father);
//push
- xbt_dynar_push (currentContainer, new);
+ xbt_dynar_push (currentContainer, &new);
}
static void instr_routing_parse_end_AS ()
static void instr_routing_parse_start_link ()
{
- container_t father = xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
- container_t new = newContainer (A_surfxml_link_id, INSTR_LINK, father);
+ container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+ const char *link_id = A_surfxml_link_id;
- type_t bandwidth = getVariableType ("bandwidth", NULL, new->type);
- type_t latency = getVariableType ("latency", NULL, new->type);
- pajeSetVariable (0, bandwidth->id, new->id, A_surfxml_link_bandwidth);
- pajeSetVariable (0, latency->id, new->id, A_surfxml_link_latency);
- if (TRACE_uncategorized()){
- getVariableType ("bandwidth_used", "0.5 0.5 0.5", new->type);
+ double bandwidth_value = atof(A_surfxml_link_bandwidth);
+ double latency_value = atof(A_surfxml_link_latency);
+ xbt_dynar_t links_to_create = xbt_dynar_new (sizeof(char*), &xbt_free_ref);
+
+ if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX){
+ char *up = bprintf("%s_UP", link_id);
+ char *down = bprintf("%s_DOWN", link_id);
+ xbt_dynar_push_as (links_to_create, char*, xbt_strdup(up));
+ xbt_dynar_push_as (links_to_create, char*, xbt_strdup(down));
+ free (up);
+ free (down);
+ }else{
+ xbt_dynar_push_as (links_to_create, char*, strdup(link_id));
}
+
+ char *link_name = NULL;
+ unsigned int i;
+ xbt_dynar_foreach (links_to_create, i, link_name){
+
+ container_t new = newContainer (link_name, INSTR_LINK, father);
+
+ type_t bandwidth = getVariableType ("bandwidth", NULL, new->type);
+ type_t latency = getVariableType ("latency", NULL, new->type);
+ new_pajeSetVariable (0, new, bandwidth, bandwidth_value);
+ new_pajeSetVariable (0, new, latency, latency_value);
+ if (TRACE_uncategorized()){
+ getVariableType ("bandwidth_used", "0.5 0.5 0.5", new->type);
+ }
+ }
+
+ xbt_dynar_free (&links_to_create);
}
static void instr_routing_parse_end_link ()
static void instr_routing_parse_start_host ()
{
- container_t father = xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+ container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
container_t new = newContainer (A_surfxml_host_id, INSTR_HOST, father);
type_t power = getVariableType ("power", NULL, new->type);
- pajeSetVariable (0, power->id, new->id, A_surfxml_host_power);
+ new_pajeSetVariable (0, new, power, atof(A_surfxml_host_power));
if (TRACE_uncategorized()){
getVariableType ("power_used", "0.5 0.5 0.5", new->type);
}
+
+ if (TRACE_smpi_is_enabled()) {
+ if (TRACE_smpi_is_grouped()){
+ type_t mpi = getContainerType("MPI", new->type);
+ getStateType ("MPI_STATE", mpi);
+ getLinkType ("MPI_LINK", getRootType(), mpi, mpi);
+ }
+ }
+
+ if (TRACE_msg_process_is_enabled()) {
+ type_t msg_process = getContainerType("MSG_PROCESS", new->type);
+ type_t state = getStateType ("MSG_PROCESS_STATE", msg_process);
+ getValue ("executing", "0 1 0", state);
+ getValue ("suspend", "1 0 1", state);
+ getValue ("sleep", "1 1 0", state);
+ getValue ("receive", "1 0 0", state);
+ getValue ("send", "0 0 1", state);
+ getValue ("task_execute", "0 1 1", state);
+ getLinkType ("MSG_PROCESS_LINK", getRootType(), msg_process, msg_process);
+ getLinkType ("MSG_PROCESS_TASK_LINK", getRootType(), msg_process, msg_process);
+ }
+
+ if (TRACE_msg_task_is_enabled()) {
+ type_t msg_task = getContainerType ("MSG_TASK", new->type);
+ type_t state = getStateType ("MSG_TASK_STATE", msg_task);
+ getValue ("MSG_task_execute", "0 1 0", state);
+ getValue ("created", "1 1 0", state);
+ getLinkType ("MSG_TASK_LINK", getRootType(), msg_task, msg_task);
+ }
}
static void instr_routing_parse_end_host ()
static void instr_routing_parse_start_router ()
{
- container_t father = xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+ container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
newContainer (A_surfxml_router_id, INSTR_ROUTER, father);
}
static void instr_routing_parse_end_platform ()
{
+ xbt_dynar_free(¤tContainer);
currentContainer = NULL;
- recursiveGraphExtraction (rootContainer);
+ xbt_dict_t filter = xbt_dict_new ();
+ recursiveGraphExtraction (getRootContainer(), filter);
+ xbt_dict_free(&filter);
platform_created = 1;
+ TRACE_paje_dump_buffer(1);
}
-/*
- * Support functions
- */
-int instr_link_is_traced (const char *name)
-{
- if (((container_t)xbt_dict_get_or_null (allContainers, name))){
- return 1;
- } else {
- return 0;
- }
-}
-
-char *instr_variable_type (const char *name, const char *resource)
-{
- container_t container = (container_t)xbt_dict_get (allContainers, resource);
- xbt_dict_cursor_t cursor = NULL;
- type_t type;
- char *type_name;
- xbt_dict_foreach(container->type->children, cursor, type_name, type) {
- if (strcmp (name, type->name) == 0) return type->id;
- }
- return NULL;
-}
-
-char *instr_resource_type (const char *resource_name)
-{
- return ((container_t)xbt_dict_get_or_null (allContainers, resource_name))->id;
-}
-
-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);
- }
-
- pajeDestroyContainer(SIMIX_get_clock(), container->type->id, container->id);
-
- xbt_free (container->name);
- xbt_free (container->id);
- xbt_free (container->children);
- xbt_free (container);
- container = NULL;
-}
-
-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);
- type = NULL;
-}
-
-void instr_destroy_platform ()
+void instr_routing_define_callbacks ()
{
- if (rootContainer) recursiveDestroyContainer (rootContainer);
- if (rootType) recursiveDestroyType (rootType);
+ if (!TRACE_is_active())
+ return;
+ surfxml_add_callback(STag_surfxml_AS_cb_list, &instr_routing_parse_start_AS);
+ surfxml_add_callback(ETag_surfxml_AS_cb_list, &instr_routing_parse_end_AS);
+ surfxml_add_callback(STag_surfxml_link_cb_list, &instr_routing_parse_start_link);
+ surfxml_add_callback(ETag_surfxml_link_cb_list, &instr_routing_parse_end_link);
+ surfxml_add_callback(STag_surfxml_host_cb_list, &instr_routing_parse_start_host);
+ surfxml_add_callback(ETag_surfxml_host_cb_list, &instr_routing_parse_end_host);
+ surfxml_add_callback(STag_surfxml_router_cb_list, &instr_routing_parse_start_router);
+ surfxml_add_callback(ETag_surfxml_router_cb_list, &instr_routing_parse_end_router);
+ surfxml_add_callback(ETag_surfxml_platform_cb_list, &instr_routing_parse_end_platform);
}
/*
*/
static void recursiveNewUserVariableType (const char *new_typename, const char *color, type_t root)
{
- if (!strcmp (root->name, "HOST") || !strcmp (root->name, "LINK")){
- newVariableType(new_typename, TYPE_VARIABLE, color, root);
+ if (!strcmp (root->name, "HOST")){
+ char tnstr[INSTR_DEFAULT_STR_SIZE];
+ snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "p%s", new_typename);
+ getVariableType(tnstr, color, root);
+ }
+ if (!strcmp (root->name, "LINK")){
+ char tnstr[INSTR_DEFAULT_STR_SIZE];
+ snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "b%s", new_typename);
+ getVariableType(tnstr, color, root);
}
xbt_dict_cursor_t cursor = NULL;
type_t child_type;
void instr_new_user_variable_type (const char *new_typename, const char *color)
{
- recursiveNewUserVariableType (new_typename, color, rootType);
+ recursiveNewUserVariableType (new_typename, color, getRootType());
}
static void recursiveNewUserLinkVariableType (const char *new_typename, const char *color, type_t root)
{
if (!strcmp (root->name, "LINK")){
- newVariableType(new_typename, TYPE_VARIABLE, color, root);
+ getVariableType(new_typename, color, root);
}
xbt_dict_cursor_t cursor = NULL;
type_t child_type;
void instr_new_user_link_variable_type (const char *new_typename, const char *color)
{
- recursiveNewUserLinkVariableType (new_typename, color, rootType);
+ recursiveNewUserLinkVariableType (new_typename, color, getRootType());
}
static void recursiveNewUserHostVariableType (const char *new_typename, const char *color, type_t root)
{
if (!strcmp (root->name, "HOST")){
- newVariableType(new_typename, TYPE_VARIABLE, color, root);
+ getVariableType(new_typename, color, root);
}
xbt_dict_cursor_t cursor = NULL;
type_t child_type;
void instr_new_user_host_variable_type (const char *new_typename, const char *color)
{
- recursiveNewUserHostVariableType (new_typename, color, rootType);
+ recursiveNewUserHostVariableType (new_typename, color, getRootType());
}
int instr_platform_traced ()
