X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bed4fe0e8f404bd48f9bb3da46ea86793dfd14f..294430954d6bdfd2bdf43fcc49fde087be1474c6:/src/surf/workstation_KCCFLN05.c diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c index fe5d0490b4..5695942d6a 100644 --- a/src/surf/workstation_KCCFLN05.c +++ b/src/surf/workstation_KCCFLN05.c @@ -32,8 +32,9 @@ typedef struct router_KCCFLN05 { /**************************************/ typedef struct cpu_KCCFLN05 { surf_model_t model; + xbt_dict_t properties; /* Do not move this field */ e_surf_workstation_model_type_t type; /* Do not move this field */ - char *name; /* Do not move this field */ + char *name; /* Do not move this field */ lmm_constraint_t constraint; lmm_constraint_t bus; double power_scale; @@ -53,18 +54,19 @@ typedef struct cpu_KCCFLN05 { /*********** network object ***********/ /**************************************/ -typedef struct network_link_KCCFLN05 { +typedef struct link_KCCFLN05 { surf_model_t model; + xbt_dict_t properties; /* Do not move this field */ e_surf_workstation_model_type_t type; /* Do not move this field */ - char *name; /* Do not move this field */ + char *name; /* Do not move this field */ lmm_constraint_t constraint; double lat_current; tmgr_trace_event_t lat_event; double bw_current; tmgr_trace_event_t bw_event; - e_surf_network_link_state_t state_current; + e_surf_link_state_t state_current; tmgr_trace_event_t state_event; -} s_network_link_KCCFLN05_t, *network_link_KCCFLN05_t; +} s_link_KCCFLN05_t, *link_KCCFLN05_t; typedef struct s_route_KCCFLN05 { @@ -72,7 +74,7 @@ typedef struct s_route_KCCFLN05 { double impact_on_dst; double impact_on_src_with_other_recv; double impact_on_dst_with_other_send; - network_link_KCCFLN05_t *links; + link_KCCFLN05_t *links; int size; } s_route_KCCFLN05_t, *route_KCCFLN05_t; @@ -96,12 +98,12 @@ typedef struct surf_action_workstation_KCCFLN05 { static int nb_workstation = 0; static s_route_KCCFLN05_t *routing_table = NULL; #define ROUTE(i,j) routing_table[(i)+(j)*nb_workstation] -static network_link_KCCFLN05_t loopback = NULL; -static xbt_dict_t parallel_task_network_link_set = NULL; +static link_KCCFLN05_t loopback = NULL; +static xbt_dict_t parallel_task_link_set = NULL; //added to work with GTNETS static xbt_dict_t router_set = NULL; static lmm_system_t maxmin_system = NULL; -/*xbt_dict_t network_link_set = NULL;*/ +/*xbt_dict_t link_set = NULL;*/ /* convenient function */ @@ -185,7 +187,7 @@ static void *name_service(const char *name) static const char *get_resource_name(void *resource_id) { /* We can freely cast as a cpu_KCCFLN05_t because it has the same - prefix as network_link_KCCFLN05_t. However, only cpu_KCCFLN05_t + prefix as link_KCCFLN05_t. However, only cpu_KCCFLN05_t will theoretically be given as an argument here. */ return ((cpu_KCCFLN05_t) resource_id)->name; } @@ -312,7 +314,7 @@ static void action_set_priority(surf_action_t action, double priority) static int resource_used(void *resource_id) { - /* We can freely cast as a network_link_KCCFLN05_t because it has + /* We can freely cast as a link_KCCFLN05_t because it has the same prefix as cpu_KCCFLN05_t */ if (((cpu_KCCFLN05_t) resource_id)->type == SURF_WORKSTATION_RESOURCE_CPU) @@ -324,7 +326,7 @@ static int resource_used(void *resource_id) bus) : 0)); else return lmm_constraint_used(maxmin_system, - ((network_link_KCCFLN05_t) resource_id)-> + ((link_KCCFLN05_t) resource_id)-> constraint); } @@ -336,11 +338,11 @@ static double share_resources(double now) xbt_swag_t running_actions = surf_workstation_model->common_public->states.running_action_set; - double min = generic_maxmin_share_resources2(running_actions, - xbt_swag_offset(s_action, - variable), - maxmin_system, - lmm_solve); + double min = generic_maxmin_share_resources(running_actions, + xbt_swag_offset(s_action, + variable), + maxmin_system, + lmm_solve); xbt_swag_foreach(action, running_actions) { if (action->latency > 0) { @@ -415,11 +417,11 @@ static void update_actions_state(double now, double delta) i++))) { constraint_id = lmm_constraint_id(cnst); -/* if(((network_link_KCCFLN05_t)constraint_id)->type== */ +/* if(((link_KCCFLN05_t)constraint_id)->type== */ /* SURF_WORKSTATION_RESOURCE_LINK) { */ /* DEBUG2("Checking for link %s (%p)", */ -/* ((network_link_KCCFLN05_t)constraint_id)->name, */ -/* ((network_link_KCCFLN05_t)constraint_id)); */ +/* ((link_KCCFLN05_t)constraint_id)->name, */ +/* ((link_KCCFLN05_t)constraint_id)); */ /* } */ /* if(((cpu_KCCFLN05_t)constraint_id)->type== */ /* SURF_WORKSTATION_RESOURCE_CPU) { */ @@ -429,10 +431,10 @@ static void update_actions_state(double now, double delta) /* ((cpu_KCCFLN05_t)constraint_id)->state_current==SURF_CPU_OFF?"Off":"On"); */ /* } */ - if (((((network_link_KCCFLN05_t) constraint_id)->type == + if (((((link_KCCFLN05_t) constraint_id)->type == SURF_WORKSTATION_RESOURCE_LINK) && - (((network_link_KCCFLN05_t) constraint_id)->state_current == - SURF_NETWORK_LINK_OFF)) || + (((link_KCCFLN05_t) constraint_id)->state_current == + SURF_LINK_OFF)) || ((((cpu_KCCFLN05_t) constraint_id)->type == SURF_WORKSTATION_RESOURCE_CPU) && (((cpu_KCCFLN05_t) constraint_id)->state_current == @@ -454,7 +456,7 @@ static void update_resource_state(void *id, double value) { cpu_KCCFLN05_t cpu = id; - network_link_KCCFLN05_t nw_link = id; + link_KCCFLN05_t nw_link = id; if (nw_link->type == SURF_WORKSTATION_RESOURCE_LINK) { DEBUG2("Updating link %s (%p)", nw_link->name, nw_link); @@ -493,9 +495,9 @@ static void update_resource_state(void *id, } } else if (event_type == nw_link->state_event) { if (value > 0) - nw_link->state_current = SURF_NETWORK_LINK_ON; + nw_link->state_current = SURF_LINK_ON; else - nw_link->state_current = SURF_NETWORK_LINK_OFF; + nw_link->state_current = SURF_LINK_OFF; } else { CRITICAL0("Unknown event ! \n"); xbt_abort(); @@ -526,11 +528,11 @@ static void finalize(void) { int i, j; - xbt_dict_free(&network_link_set); + xbt_dict_free(&link_set); xbt_dict_free(&workstation_set); xbt_dict_free(&router_set); - if (parallel_task_network_link_set != NULL) { - xbt_dict_free(¶llel_task_network_link_set); + if (parallel_task_link_set != NULL) { + xbt_dict_free(¶llel_task_link_set); } xbt_swag_free(surf_workstation_model->common_public->states. ready_action_set); @@ -631,6 +633,10 @@ static double get_available_speed(void *cpu) return ((cpu_KCCFLN05_t) cpu)->power_current; } +static xbt_dict_t get_cpu_properties(void *cpu) +{ + return ((cpu_KCCFLN05_t) cpu)->properties; +} static surf_action_t communicate(void *src, void *dst, double size, double rate) @@ -731,8 +737,8 @@ static surf_action_t execute_parallel_task(int workstation_nb, int nb_link = 0; int nb_host = 0; - if (parallel_task_network_link_set == NULL) { - parallel_task_network_link_set = + if (parallel_task_link_set == NULL) { + parallel_task_link_set = xbt_dict_new_ext(workstation_nb * workstation_nb * 10); } @@ -742,18 +748,18 @@ static surf_action_t execute_parallel_task(int workstation_nb, cpu_KCCFLN05_t card_src = workstation_list[i]; cpu_KCCFLN05_t card_dst = workstation_list[j]; int route_size = ROUTE(card_src->id, card_dst->id).size; - network_link_KCCFLN05_t *route = + link_KCCFLN05_t *route = ROUTE(card_src->id, card_dst->id).links; if (communication_amount[i * workstation_nb + j] > 0) for (k = 0; k < route_size; k++) { - xbt_dict_set(parallel_task_network_link_set, route[k]->name, + xbt_dict_set(parallel_task_link_set, route[k]->name, route[k], NULL); } } } - nb_link = xbt_dict_length(parallel_task_network_link_set); - xbt_dict_reset(parallel_task_network_link_set); + nb_link = xbt_dict_length(parallel_task_link_set); + xbt_dict_reset(parallel_task_link_set); for (i = 0; i < workstation_nb; i++) @@ -798,7 +804,7 @@ static surf_action_t execute_parallel_task(int workstation_nb, cpu_KCCFLN05_t card_src = workstation_list[i]; cpu_KCCFLN05_t card_dst = workstation_list[j]; int route_size = ROUTE(card_src->id, card_dst->id).size; - network_link_KCCFLN05_t *route = + link_KCCFLN05_t *route = ROUTE(card_src->id, card_dst->id).links; for (k = 0; k < route_size; k++) { @@ -819,7 +825,7 @@ static surf_action_t execute_parallel_task(int workstation_nb, return (surf_action_t) action; } -/* returns an array of network_link_KCCFLN05_t */ +/* returns an array of link_KCCFLN05_t */ static const void **get_route(void *src, void *dst) { cpu_KCCFLN05_t card_src = src; @@ -839,19 +845,25 @@ static int get_route_size(void *src, void *dst) static const char *get_link_name(const void *link) { - return ((network_link_KCCFLN05_t) link)->name; + return ((link_KCCFLN05_t) link)->name; } static double get_link_bandwidth(const void *link) { - return ((network_link_KCCFLN05_t) link)->bw_current; + return ((link_KCCFLN05_t) link)->bw_current; } static double get_link_latency(const void *link) { - return ((network_link_KCCFLN05_t) link)->lat_current; + return ((link_KCCFLN05_t) link)->lat_current; +} + +static xbt_dict_t get_link_properties(void *link) +{ + return ((link_KCCFLN05_t) link)->properties; } + /**************************************/ /*** Resource Creation & Destruction **/ /**************************************/ @@ -865,10 +877,10 @@ static void router_free(void *router) static void router_new(const char *name) { static unsigned int nb_routers = 0; + router_KCCFLN05_t router; INFO1("Creating a router %s", name); - router_KCCFLN05_t router; router = xbt_new0(s_router_KCCFLN05_t, 1); router->name = xbt_strdup(name); @@ -879,7 +891,7 @@ static void router_new(const char *name) static void parse_routers(void) { //add a dumb router just to be GTNETS compatible - router_new(A_surfxml_router_name); + router_new(A_surfxml_router_id); } static void cpu_free(void *cpu) @@ -898,7 +910,8 @@ static cpu_KCCFLN05_t cpu_new(const char *name, double power_scale, double interference_send, double interference_recv, double interference_send_recv, - double max_outgoing_rate) + double max_outgoing_rate, + xbt_dict_t cpu_properties_k) { cpu_KCCFLN05_t cpu = xbt_new0(s_cpu_KCCFLN05_t, 1); @@ -935,12 +948,20 @@ static cpu_KCCFLN05_t cpu_new(const char *name, double power_scale, cpu->outgoing_communications = xbt_dynar_new(sizeof(surf_action_workstation_KCCFLN05_t), NULL); + /*add the property set*/ + cpu->properties = current_property_set; + xbt_dict_set(workstation_set, name, cpu, cpu_free); return cpu; } -static void parse_cpu(void) +static void create_routing_table(void) +{ + routing_table = xbt_new0(s_route_KCCFLN05_t, nb_workstation * nb_workstation); +} + +static void parse_cpu_init(void) { double power_scale = 0.0; double power_initial = 0.0; @@ -952,57 +973,51 @@ static void parse_cpu(void) double interference_send_recv = 0.0; double max_outgoing_rate = -1.0; - surf_parse_get_double(&power_scale, A_surfxml_cpu_power); - surf_parse_get_double(&power_initial, A_surfxml_cpu_availability); - surf_parse_get_trace(&power_trace, A_surfxml_cpu_availability_file); + surf_parse_get_double(&power_scale, A_surfxml_host_power); + surf_parse_get_double(&power_initial, A_surfxml_host_availability); + surf_parse_get_trace(&power_trace, A_surfxml_host_availability_file); - xbt_assert0((A_surfxml_cpu_state == A_surfxml_cpu_state_ON) || - (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF), + xbt_assert0((A_surfxml_host_state == A_surfxml_host_state_ON) || + (A_surfxml_host_state == A_surfxml_host_state_OFF), "Invalid state"); - if (A_surfxml_cpu_state == A_surfxml_cpu_state_ON) + if (A_surfxml_host_state == A_surfxml_host_state_ON) state_initial = SURF_CPU_ON; - if (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF) + if (A_surfxml_host_state == A_surfxml_host_state_OFF) state_initial = SURF_CPU_OFF; - surf_parse_get_trace(&state_trace, A_surfxml_cpu_state_file); + surf_parse_get_trace(&state_trace, A_surfxml_host_state_file); surf_parse_get_double(&interference_send, - A_surfxml_cpu_interference_send); + A_surfxml_host_interference_send); surf_parse_get_double(&interference_recv, - A_surfxml_cpu_interference_recv); + A_surfxml_host_interference_recv); surf_parse_get_double(&interference_send_recv, - A_surfxml_cpu_interference_send_recv); + A_surfxml_host_interference_send_recv); surf_parse_get_double(&max_outgoing_rate, - A_surfxml_cpu_max_outgoing_rate); - - cpu_new(A_surfxml_cpu_name, power_scale, power_initial, power_trace, + A_surfxml_host_max_outgoing_rate); + current_property_set = xbt_dict_new(); + cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace, state_initial, state_trace, interference_send, interference_recv, - interference_send_recv, max_outgoing_rate); -} - -static void create_routing_table(void) -{ - routing_table = - xbt_new0(s_route_KCCFLN05_t, nb_workstation * nb_workstation); + interference_send_recv, max_outgoing_rate,/*add the properties*/current_property_set); } -static void network_link_free(void *nw_link) +static void link_free(void *nw_link) { - free(((network_link_KCCFLN05_t) nw_link)->name); + free(((link_KCCFLN05_t) nw_link)->name); free(nw_link); } -static network_link_KCCFLN05_t network_link_new(char *name, - double bw_initial, - tmgr_trace_t bw_trace, - double lat_initial, - tmgr_trace_t lat_trace, - e_surf_network_link_state_t - state_initial, - tmgr_trace_t state_trace, - e_surf_network_link_sharing_policy_t - policy) +static link_KCCFLN05_t link_new(char *name, + double bw_initial, + tmgr_trace_t bw_trace, + double lat_initial, + tmgr_trace_t lat_trace, + e_surf_link_state_t + state_initial, + tmgr_trace_t state_trace, + e_surf_link_sharing_policy_t + policy, xbt_dict_t properties_args) { - network_link_KCCFLN05_t nw_link = xbt_new0(s_network_link_KCCFLN05_t, 1); + link_KCCFLN05_t nw_link = xbt_new0(s_link_KCCFLN05_t, 1); nw_link->model = (surf_model_t) surf_workstation_model; @@ -1024,58 +1039,61 @@ static network_link_KCCFLN05_t network_link_new(char *name, nw_link->constraint = lmm_constraint_new(maxmin_system, nw_link, nw_link->bw_current); - if (policy == SURF_NETWORK_LINK_FATPIPE) + if (policy == SURF_LINK_FATPIPE) lmm_constraint_shared(nw_link->constraint); - xbt_dict_set(network_link_set, name, nw_link, network_link_free); + /*add the property set*/ + nw_link->properties = properties_args; + + xbt_dict_set(link_set, name, nw_link, link_free); return nw_link; } -static void parse_network_link(void) +static void parse_link_init(void) { - char *name; + char *name_link; double bw_initial; tmgr_trace_t bw_trace; double lat_initial; tmgr_trace_t lat_trace; - e_surf_network_link_state_t state_initial = SURF_NETWORK_LINK_ON; - e_surf_network_link_sharing_policy_t policy_initial = - SURF_NETWORK_LINK_SHARED; + e_surf_link_state_t state_initial_link = SURF_LINK_ON; + e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED; tmgr_trace_t state_trace; - name = xbt_strdup(A_surfxml_network_link_name); - surf_parse_get_double(&bw_initial, A_surfxml_network_link_bandwidth); - surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file); - surf_parse_get_double(&lat_initial, A_surfxml_network_link_latency); - surf_parse_get_trace(&lat_trace, A_surfxml_network_link_latency_file); - - xbt_assert0((A_surfxml_network_link_state == - A_surfxml_network_link_state_ON) - || (A_surfxml_network_link_state == - A_surfxml_network_link_state_OFF), "Invalid state"); - if (A_surfxml_network_link_state == A_surfxml_network_link_state_ON) - state_initial = SURF_NETWORK_LINK_ON; - else if (A_surfxml_network_link_state == - A_surfxml_network_link_state_OFF) - state_initial = SURF_NETWORK_LINK_OFF; - - if (A_surfxml_network_link_sharing_policy == - A_surfxml_network_link_sharing_policy_SHARED) - policy_initial = SURF_NETWORK_LINK_SHARED; - else if (A_surfxml_network_link_sharing_policy == - A_surfxml_network_link_sharing_policy_FATPIPE) - policy_initial = SURF_NETWORK_LINK_FATPIPE; - - surf_parse_get_trace(&state_trace, A_surfxml_network_link_state_file); - - network_link_new(name, bw_initial, bw_trace, - lat_initial, lat_trace, state_initial, state_trace, - policy_initial); + name_link = xbt_strdup(A_surfxml_link_id); + surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth); + surf_parse_get_trace(&bw_trace, A_surfxml_link_bandwidth_file); + surf_parse_get_double(&lat_initial, A_surfxml_link_latency); + surf_parse_get_trace(&lat_trace, A_surfxml_link_latency_file); + + xbt_assert0((A_surfxml_link_state == + A_surfxml_link_state_ON) + || (A_surfxml_link_state == + A_surfxml_link_state_OFF), "Invalid state"); + if (A_surfxml_link_state == A_surfxml_link_state_ON) + state_initial_link = SURF_LINK_ON; + else if (A_surfxml_link_state == + A_surfxml_link_state_OFF) + state_initial_link = SURF_LINK_OFF; + + if (A_surfxml_link_sharing_policy == + A_surfxml_link_sharing_policy_SHARED) + policy_initial_link = SURF_LINK_SHARED; + else if (A_surfxml_link_sharing_policy == + A_surfxml_link_sharing_policy_FATPIPE) + policy_initial_link = SURF_LINK_FATPIPE; + + surf_parse_get_trace(&state_trace, A_surfxml_link_state_file); + + current_property_set = xbt_dict_new(); + link_new(name_link, bw_initial, bw_trace, + lat_initial, lat_trace, state_initial_link, state_trace, + policy_initial_link,/*add properties*/current_property_set); } static void route_new(int src_id, int dst_id, - network_link_KCCFLN05_t * link_list, int nb_link, + link_KCCFLN05_t * link_list, int nb_link, double impact_on_src, double impact_on_dst, double impact_on_src_with_other_recv, double impact_on_dst_with_other_send) @@ -1083,28 +1101,32 @@ static void route_new(int src_id, int dst_id, route_KCCFLN05_t route = &(ROUTE(src_id, dst_id)); route->size = nb_link; - route->links = link_list = - xbt_realloc(link_list, sizeof(network_link_KCCFLN05_t) * nb_link); + route->links = link_list = xbt_realloc(link_list, sizeof(link_KCCFLN05_t) * nb_link); route->impact_on_src = impact_on_src; - route->impact_on_dst = impact_on_src; + route->impact_on_dst = impact_on_dst; route->impact_on_src_with_other_recv = impact_on_src_with_other_recv; route->impact_on_dst_with_other_send = impact_on_dst_with_other_send; + } static int nb_link; static int link_list_capacity; -static network_link_KCCFLN05_t *link_list = NULL; +static link_KCCFLN05_t *link_list = NULL; static int src_id = -1; static int dst_id = -1; static double impact_on_src; static double impact_on_dst; static double impact_on_src_with_other_recv; static double impact_on_dst_with_other_send; +static int is_first = 1; static void parse_route_set_endpoints(void) { cpu_KCCFLN05_t cpu_tmp = NULL; + if (is_first) create_routing_table(); + is_first = 0; + cpu_tmp = (cpu_KCCFLN05_t) name_service(A_surfxml_route_src); if (cpu_tmp != NULL) { src_id = cpu_tmp->id; @@ -1136,7 +1158,7 @@ static void parse_route_set_endpoints(void) nb_link = 0; link_list_capacity = 1; - link_list = xbt_new(network_link_KCCFLN05_t, link_list_capacity); + link_list = xbt_new(link_KCCFLN05_t, link_list_capacity); } @@ -1148,15 +1170,15 @@ static void parse_route_elem(void) link_list = xbt_realloc(link_list, (link_list_capacity) * - sizeof(network_link_KCCFLN05_t)); + sizeof(link_KCCFLN05_t)); } TRY { link_list[nb_link++] = - xbt_dict_get(network_link_set, A_surfxml_route_element_name); + xbt_dict_get(link_set, A_surfxml_link_c_ctn_id); } CATCH(e) { RETHROW1("Link %s not found (dict raised this exception: %s)", - A_surfxml_route_element_name); + A_surfxml_link_c_ctn_id); } } @@ -1166,54 +1188,39 @@ static void parse_route_set_route(void) route_new(src_id, dst_id, link_list, nb_link, impact_on_src, impact_on_dst, impact_on_src_with_other_recv, impact_on_dst_with_other_send); + } + static void parse_file(const char *file) { int i; - /* Figuring out the cpus */ - surf_parse_reset_parser(); - ETag_surfxml_cpu_fun = parse_cpu; - surf_parse_open(file); - xbt_assert1((!surf_parse()), "Parse error in %s", file); - surf_parse_close(); - - create_routing_table(); - - /* Figuring out the router (added after GTNETS) */ - surf_parse_reset_parser(); - STag_surfxml_router_fun = parse_routers; - surf_parse_open(file); - xbt_assert1((!surf_parse()), "Parse error in %s", file); - surf_parse_close(); - - /* Figuring out the network links */ - surf_parse_reset_parser(); - ETag_surfxml_network_link_fun = parse_network_link; - surf_parse_open(file); - xbt_assert1((!surf_parse()), "Parse error in %s", file); - surf_parse_close(); - - /* Building the routes */ + /* Adding callback functions */ surf_parse_reset_parser(); - STag_surfxml_route_fun = parse_route_set_endpoints; - ETag_surfxml_route_element_fun = parse_route_elem; - ETag_surfxml_route_fun = parse_route_set_route; + surfxml_add_callback(STag_surfxml_host_cb_list, &parse_cpu_init); + surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties); + surfxml_add_callback(STag_surfxml_router_cb_list, &parse_routers); + surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init); + surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints); + surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem); + surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route); + + /* Parse the file */ surf_parse_open(file); xbt_assert1((!surf_parse()), "Parse error in %s", file); surf_parse_close(); - + /* Adding loopback if needed */ for (i = 0; i < nb_workstation; i++) if (!ROUTE(i, i).size) { if (!loopback) - loopback = network_link_new(xbt_strdup("__MSG_loopback__"), + loopback = link_new(xbt_strdup("__MSG_loopback__"), 498000000, NULL, 0.000015, NULL, - SURF_NETWORK_LINK_ON, NULL, - SURF_NETWORK_LINK_FATPIPE); + SURF_LINK_ON, NULL, + SURF_LINK_FATPIPE, NULL); ROUTE(i, i).size = 1; - ROUTE(i, i).links = xbt_new0(network_link_KCCFLN05_t, 1); + ROUTE(i, i).links = xbt_new0(link_KCCFLN05_t, 1); ROUTE(i, i).links[0] = loopback; } @@ -1289,6 +1296,10 @@ static void model_init_internal(void) surf_workstation_model->extension_public->get_speed = get_speed; surf_workstation_model->extension_public->get_available_speed = get_available_speed; + + surf_workstation_model->common_public->get_cpu_properties = get_cpu_properties; + surf_workstation_model->common_public->get_link_properties = get_link_properties; + surf_workstation_model->extension_public->communicate = communicate; surf_workstation_model->extension_public->execute_parallel_task = execute_parallel_task; @@ -1304,7 +1315,7 @@ static void model_init_internal(void) workstation_set = xbt_dict_new(); router_set = xbt_dict_new(); - network_link_set = xbt_dict_new(); + link_set = xbt_dict_new(); if (!maxmin_system) maxmin_system = lmm_system_new(); }