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);
+ xbt_dict_set (filter, aux1, xbt_strdup ("1"), NULL);
+ xbt_dict_set (filter, aux2, xbt_strdup ("1"), NULL);
}
//declare type
char link_typename[INSTR_DEFAULT_STR_SIZE];
snprintf (link_typename, INSTR_DEFAULT_STR_SIZE, "%s-%s", src->type->name, dst->type->name);
- type_t link_type = getLinkType (link_typename, father->type, src->type, dst->type);
+ type_t link_type = PJ_type_get_or_null (link_typename, father->type);
+ if (link_type == NULL){
+ link_type = PJ_type_link_new (link_typename, father->type, src->type, dst->type);
+ }
//register EDGE types for triva configuration
- xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), xbt_free);
+ xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), NULL);
//create the link
static long long counter = 0;
new_pajeEndLink(SIMIX_get_clock(), father, link_type, dst, "G", key);
}
-static void recursiveGraphExtraction (routing_component_t rc, container_t container, xbt_dict_t filter)
+static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t filter)
{
- if (xbt_dict_length (rc->routing_sons)){
+ if (!xbt_dict_is_empty(rc->routing_sons)){
xbt_dict_cursor_t cursor = NULL;
- routing_component_t rc_son;
+ AS_t rc_son;
char *child_name;
//bottom-up recursion
xbt_dict_foreach(rc->routing_sons, cursor, child_name, rc_son) {
(child2->kind == INSTR_HOST || child2->kind == INSTR_ROUTER) &&
strcmp (child1_name, child2_name) != 0){
- xbt_dynar_t route = global_routing->get_route (child1_name, child2_name);
+ xbt_dynar_t route = NULL;
+ xbt_ex_t e;
+
+ TRY {
+ routing_get_route_and_latency(child1_name, child2_name, &route, NULL);
+ } CATCH(e) {
+ xbt_ex_free(e);
+ }
+ if (route == NULL) continue;
+
if (TRACE_onelink_only()){
if (xbt_dynar_length (route) > 1) continue;
}
- unsigned int cpt;
- void *link;
container_t previous = child1;
- xbt_dynar_foreach (route, cpt, link) {
- char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
- container_t current = getContainerByName(link_name);
+ int i;
+ for (i = 0; i < xbt_dynar_length(route); i++){
+ link_CM02_t *link = ((link_CM02_t*)xbt_dynar_get_ptr (route, i));
+ char *link_name = (*link)->lmm_resource.generic_resource.name;
+ container_t current = PJ_container_get(link_name);
linkContainers(container, previous, current, filter);
previous = current;
}
child2->kind == INSTR_AS &&
strcmp(child1_name, child2_name) != 0){
- route_extended_t route = rc->get_route (rc, child1_name, child2_name);
+ route_t route = xbt_new0(s_route_t,1);
+ route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
+ rc->get_route_and_latency (rc, child1_name, child2_name, route,NULL);
unsigned int cpt;
void *link;
- container_t previous = getContainerByName(route->src_gateway);
- xbt_dynar_foreach (route->generic_route.link_list, cpt, link) {
+ container_t previous = PJ_container_get(route->src_gateway);
+ xbt_dynar_foreach (route->link_list, cpt, link) {
char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
- container_t current = getContainerByName(link_name);
+ container_t current = PJ_container_get(link_name);
linkContainers (container, previous, current, filter);
previous = current;
}
- container_t last = getContainerByName(route->dst_gateway);
+ container_t last = PJ_container_get(route->dst_gateway);
linkContainers (container, previous, last, filter);
+ generic_free_route(route);
}
}
}
/*
* Callbacks
*/
-static void instr_routing_parse_start_AS ()
+static void instr_routing_parse_start_AS (const char*id,const char*routing)
{
- if (getRootContainer() == NULL){
- container_t root = newContainer (A_surfxml_AS_id, INSTR_AS, NULL);
- instr_paje_init (root);
-
- currentContainer = xbt_dynar_new (sizeof(container_t), NULL);
- xbt_dynar_push (currentContainer, &root);
+ if (PJ_container_get_root() == NULL){
+ PJ_container_alloc ();
+ PJ_type_alloc();
+ container_t root = PJ_container_new (id, INSTR_AS, NULL);
+ PJ_container_set_root (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);
+ type_t mpi = PJ_type_get_or_null ("MPI", root->type);
+ if (mpi == NULL){
+ mpi = PJ_type_container_new("MPI", root->type);
+ PJ_type_state_new ("MPI_STATE", mpi);
+ PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi);
+ }
}
}
+ if (TRACE_needs_platform()){
+ currentContainer = xbt_dynar_new (sizeof(container_t), NULL);
+ xbt_dynar_push (currentContainer, &root);
+ }
return;
}
- 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);
+ if (TRACE_needs_platform()){
+ container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
+ container_t new = PJ_container_new (id, INSTR_AS, father);
+ xbt_dynar_push (currentContainer, &new);
+ }
}
static void instr_routing_parse_end_AS ()
{
- xbt_dynar_pop_ptr (currentContainer);
+ if (TRACE_needs_platform()){
+ xbt_dynar_pop_ptr (currentContainer);
+ }
}
-static void instr_routing_parse_start_link ()
+static void instr_routing_parse_start_link (sg_platf_link_cbarg_t link)
{
container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
- const char *link_id = A_surfxml_link_id;
- double bandwidth_value = atof(A_surfxml_link_bandwidth);
- double latency_value = atof(A_surfxml_link_latency);
+ double bandwidth_value = link->bandwidth;
+ double latency_value = 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);
+ if (link->policy == SURF_LINK_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));
+ 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);
+ container_t new = PJ_container_new (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_categorized() || TRACE_uncategorized()){
+ type_t bandwidth = PJ_type_get_or_null ("bandwidth", new->type);
+ if (bandwidth == NULL){
+ bandwidth = PJ_type_variable_new ("bandwidth", NULL, new->type);
+ }
+ type_t latency = PJ_type_get_or_null ("latency", new->type);
+ if (latency == NULL){
+ latency = PJ_type_variable_new ("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);
+ type_t bandwidth_used = PJ_type_get_or_null ("bandwidth_used", new->type);
+ if (bandwidth_used == NULL){
+ bandwidth_used = PJ_type_variable_new ("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 ()
+static void instr_routing_parse_start_host (sg_platf_host_cbarg_t host)
{
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);
+ container_t new = PJ_container_new (host->id, INSTR_HOST, father);
- type_t power = getVariableType ("power", NULL, new->type);
- new_pajeSetVariable (0, new, power, atof(A_surfxml_host_power));
+ if (TRACE_categorized() || TRACE_uncategorized()) {
+ type_t power = PJ_type_get_or_null ("power", new->type);
+ if (power == NULL){
+ power = PJ_type_variable_new ("power", NULL, new->type);
+ }
+ new_pajeSetVariable (0, new, power, host->power_peak);
+ }
if (TRACE_uncategorized()){
- getVariableType ("power_used", "0.5 0.5 0.5", new->type);
+ type_t power_used = PJ_type_get_or_null ("power_used", new->type);
+ if (power_used == NULL){
+ power_used = PJ_type_variable_new ("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_smpi_is_enabled() && TRACE_smpi_is_grouped()){
+ type_t mpi = PJ_type_get_or_null ("MPI", new->type);
+ if (mpi == NULL){
+ mpi = PJ_type_container_new("MPI", new->type);
+ PJ_type_state_new ("MPI_STATE", mpi);
+ PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), 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);
+ type_t msg_process = PJ_type_get_or_null ("MSG_PROCESS", new->type);
+ if (msg_process == NULL){
+ msg_process = PJ_type_container_new("MSG_PROCESS", new->type);
+ type_t state = PJ_type_state_new ("MSG_PROCESS_STATE", msg_process);
+ PJ_value_new ("executing", "0 1 0", state);
+ PJ_value_new ("suspend", "1 0 1", state);
+ PJ_value_new ("sleep", "1 1 0", state);
+ PJ_value_new ("receive", "1 0 0", state);
+ PJ_value_new ("send", "0 0 1", state);
+ PJ_value_new ("task_execute", "0 1 1", state);
+ PJ_type_link_new ("MSG_PROCESS_LINK", PJ_type_get_root(), msg_process, msg_process);
+ PJ_type_link_new ("MSG_PROCESS_TASK_LINK", PJ_type_get_root(), msg_process, msg_process);
+ }
}
}
-static void instr_routing_parse_end_host ()
-{
-}
-
-static void instr_routing_parse_start_router ()
+static void instr_routing_parse_start_router (sg_platf_router_cbarg_t router)
{
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_router ()
-{
+ PJ_container_new (router->id, INSTR_ROUTER, father);
}
static void instr_routing_parse_end_platform ()
{
xbt_dynar_free(¤tContainer);
currentContainer = NULL;
- xbt_dict_t filter = xbt_dict_new ();
- recursiveGraphExtraction (global_routing->root, getRootContainer(), filter);
+ xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free);
+ recursiveGraphExtraction (global_routing->root, PJ_container_get_root(), filter);
xbt_dict_free(&filter);
platform_created = 1;
TRACE_paje_dump_buffer(1);
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);
+ if (!TRACE_is_enabled()) return;
+ //always need the call backs to ASes (we need only the root AS),
+ //to create the rootContainer and the rootType properly
+ sg_platf_AS_begin_add_cb(instr_routing_parse_start_AS);
+ sg_platf_AS_end_add_cb(instr_routing_parse_end_AS);
+ if (!TRACE_needs_platform()) return;
+ sg_platf_link_add_cb(instr_routing_parse_start_link);
+ sg_platf_host_add_cb(instr_routing_parse_start_host);
+ sg_platf_router_add_cb(instr_routing_parse_start_router);
+
+ sg_platf_postparse_add_cb(instr_routing_parse_end_platform);
}
/*
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);
+ PJ_type_variable_new (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);
+ PJ_type_variable_new (tnstr, color, root);
}
xbt_dict_cursor_t cursor = NULL;
type_t child_type;
void instr_new_variable_type (const char *new_typename, const char *color)
{
- recursiveNewVariableType (new_typename, color, getRootType());
+ recursiveNewVariableType (new_typename, color, PJ_type_get_root());
}
static void recursiveNewUserVariableType (const char *father_type, const char *new_typename, const char *color, type_t root)
{
if (!strcmp (root->name, father_type)){
- getVariableType(new_typename, color, root);
+ PJ_type_variable_new (new_typename, color, root);
}
xbt_dict_cursor_t cursor = NULL;
type_t child_type;
void instr_new_user_variable_type (const char *father_type, const char *new_typename, const char *color)
{
- recursiveNewUserVariableType (father_type, new_typename, color, getRootType());
+ recursiveNewUserVariableType (father_type, new_typename, color, PJ_type_get_root());
}
}
static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges,
- routing_component_t rc, container_t container)
+ AS_t rc, container_t container)
{
- if (xbt_dict_length (rc->routing_sons)){
+ if (!xbt_dict_is_empty(rc->routing_sons)){
xbt_dict_cursor_t cursor = NULL;
- routing_component_t rc_son;
+ AS_t rc_son;
char *child_name;
//bottom-up recursion
xbt_dict_foreach(rc->routing_sons, cursor, child_name, rc_son) {
(child2->kind == INSTR_HOST || child2->kind == INSTR_ROUTER) &&
strcmp (child1_name, child2_name) != 0){
- xbt_dynar_t route = global_routing->get_route (child1_name, child2_name);
+ // FIXME factorize route creation with else branch below (once possible)
+ xbt_dynar_t route=NULL;
+ routing_get_route_and_latency (child1_name, child2_name,&route,NULL);
if (TRACE_onelink_only()){
if (xbt_dynar_length (route) > 1) continue;
}
child2->kind == INSTR_AS &&
strcmp(child1_name, child2_name) != 0){
- route_extended_t route = rc->get_route (rc, child1_name, child2_name);
+ route_t route = xbt_new0(s_route_t,1);
+ route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
+ rc->get_route_and_latency (rc, child1_name, child2_name,route, NULL);
unsigned int cpt;
void *link;
xbt_node_t current, previous = new_xbt_graph_node(graph, route->src_gateway, nodes);
- xbt_dynar_foreach (route->generic_route.link_list, cpt, link) {
+ xbt_dynar_foreach (route->link_list, cpt, link) {
char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
current = new_xbt_graph_node(graph, link_name, nodes);
//previous -> current
}
current = new_xbt_graph_node(graph, route->dst_gateway, nodes);
new_xbt_graph_edge (graph, previous, current, edges);
+ generic_free_route(route);
}
}
}
xbt_graph_t instr_routing_platform_graph (void)
{
xbt_graph_t ret = xbt_graph_new_graph (0, NULL);
- xbt_dict_t nodes = xbt_dict_new ();
- xbt_dict_t edges = xbt_dict_new ();
- recursiveXBTGraphExtraction (ret, nodes, edges, global_routing->root, getRootContainer());
+ xbt_dict_t nodes = xbt_dict_new_homogeneous(NULL);
+ xbt_dict_t edges = xbt_dict_new_homogeneous(NULL);
+ recursiveXBTGraphExtraction (ret, nodes, edges, global_routing->root, PJ_container_get_root());
return ret;
}