X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4d1afaaa1e4fee55a98707443c05bdbc9abb42c..504b4d20dd2db9ea1eaa9c4b390b2a412d7c9779:/src/surf/workstation_KCCFLN05.c diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c index 97e1e7b817..b1a5ff5938 100644 --- a/src/surf/workstation_KCCFLN05.c +++ b/src/surf/workstation_KCCFLN05.c @@ -7,11 +7,96 @@ #include "xbt/ex.h" #include "xbt/dict.h" -#include "workstation_KCCFLN05_private.h" +#include "surf_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf, "Logging specific to the SURF workstation module (KCCFLN05)"); +typedef enum { + SURF_WORKSTATION_RESOURCE_CPU, + SURF_WORKSTATION_RESOURCE_LINK, +} e_surf_workstation_model_type_t; + + +/**************************************/ +/********* router object **************/ +/**************************************/ +typedef struct router_KCCFLN05 { + char *name; + unsigned int id; +} s_router_KCCFLN05_t, *router_KCCFLN05_t; + + +/**************************************/ +/********* cpu object *****************/ +/**************************************/ +typedef struct cpu_KCCFLN05 { + surf_model_t model; + e_surf_workstation_model_type_t type; /* Do not move this field */ + char *name; /* Do not move this field */ + lmm_constraint_t constraint; + lmm_constraint_t bus; + double power_scale; + double power_current; + double interference_send; + double interference_recv; + double interference_send_recv; + tmgr_trace_event_t power_event; + e_surf_cpu_state_t state_current; + tmgr_trace_event_t state_event; + int id; /* cpu and network card are a single object... */ + xbt_dynar_t incomming_communications; + xbt_dynar_t outgoing_communications; + /*Handles the properties that can be added to cpu's*/ + xbt_dict_t properties; +} s_cpu_KCCFLN05_t, *cpu_KCCFLN05_t; + +/**************************************/ +/*********** network object ***********/ +/**************************************/ + +typedef struct network_link_KCCFLN05 { + surf_model_t model; + e_surf_workstation_model_type_t type; /* 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; + tmgr_trace_event_t state_event; + /*holds the properties that can be attached to the link*/ + xbt_dict_t properties; +} s_network_link_KCCFLN05_t, *network_link_KCCFLN05_t; + + +typedef struct s_route_KCCFLN05 { + double impact_on_src; + double impact_on_dst; + double impact_on_src_with_other_recv; + double impact_on_dst_with_other_send; + network_link_KCCFLN05_t *links; + int size; +} s_route_KCCFLN05_t, *route_KCCFLN05_t; + +/**************************************/ +/*************** actions **************/ +/**************************************/ +typedef struct surf_action_workstation_KCCFLN05 { + s_surf_action_t generic_action; + double latency; + double lat_current; + lmm_variable_t variable; + double rate; + int suspended; + cpu_KCCFLN05_t src; /* could be avoided */ + cpu_KCCFLN05_t dst; /* could be avoided */ +} s_surf_action_workstation_KCCFLN05_t, + *surf_action_workstation_KCCFLN05_t; + + + static int nb_workstation = 0; static s_route_KCCFLN05_t *routing_table = NULL; #define ROUTE(i,j) routing_table[(i)+(j)*nb_workstation] @@ -19,7 +104,7 @@ static network_link_KCCFLN05_t loopback = NULL; static xbt_dict_t parallel_task_network_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;*/ @@ -190,7 +275,7 @@ static void action_resume(surf_action_t action) if (((surf_action_workstation_KCCFLN05_t) action)->lat_current == 0.0) lmm_update_variable_weight(maxmin_system, ((surf_action_workstation_KCCFLN05_t) - action)->variable, 1.0); + action)->variable, action->priority); else lmm_update_variable_weight(maxmin_system, ((surf_action_workstation_KCCFLN05_t) @@ -217,9 +302,11 @@ static void action_set_max_duration(surf_action_t action, double duration) static void action_set_priority(surf_action_t action, double priority) -{ /* FIXME: should inherit */ +{ XBT_IN2("(%p,%g)", action, priority); action->priority = priority; + lmm_update_variable_weight(maxmin_system, ((surf_action_workstation_KCCFLN05_t) action)->variable, priority); + XBT_OUT; } @@ -252,10 +339,12 @@ static double share_resources(double now) surf_action_workstation_KCCFLN05_t action = NULL; xbt_swag_t running_actions = - surf_workstation_resource->common_public->states.running_action_set; + surf_workstation_model->common_public->states.running_action_set; double min = generic_maxmin_share_resources(running_actions, xbt_swag_offset(s_action, - variable)); + variable), + maxmin_system, + lmm_solve); xbt_swag_foreach(action, running_actions) { if (action->latency > 0) { @@ -282,7 +371,7 @@ static void update_actions_state(double now, double delta) surf_action_workstation_KCCFLN05_t action = NULL; surf_action_workstation_KCCFLN05_t next_action = NULL; xbt_swag_t running_actions = - surf_workstation_resource->common_public->states.running_action_set; + surf_workstation_model->common_public->states.running_action_set; xbt_swag_foreach_safe(action, next_action, running_actions) { deltap = delta; @@ -447,21 +536,21 @@ static void finalize(void) if (parallel_task_network_link_set != NULL) { xbt_dict_free(¶llel_task_network_link_set); } - xbt_swag_free(surf_workstation_resource->common_public->states. + xbt_swag_free(surf_workstation_model->common_public->states. ready_action_set); - xbt_swag_free(surf_workstation_resource->common_public->states. + xbt_swag_free(surf_workstation_model->common_public->states. running_action_set); - xbt_swag_free(surf_workstation_resource->common_public->states. + xbt_swag_free(surf_workstation_model->common_public->states. failed_action_set); - xbt_swag_free(surf_workstation_resource->common_public->states. + xbt_swag_free(surf_workstation_model->common_public->states. done_action_set); - free(surf_workstation_resource->common_public); - free(surf_workstation_resource->common_private); - free(surf_workstation_resource->extension_public); + free(surf_workstation_model->common_public); + free(surf_workstation_model->common_private); + free(surf_workstation_model->extension_public); - free(surf_workstation_resource); - surf_workstation_resource = NULL; + free(surf_workstation_model); + surf_workstation_model = NULL; for (i = 0; i < nb_workstation; i++) for (j = 0; j < nb_workstation; j++) @@ -495,17 +584,17 @@ static surf_action_t execute(void *cpu, double size) action->generic_action.max_duration = NO_MAX_DURATION; action->generic_action.start = surf_get_clock(); action->generic_action.finish = -1.0; - action->generic_action.resource_type = - (surf_resource_t) surf_workstation_resource; + action->generic_action.model_type = + (surf_model_t) surf_workstation_model; action->suspended = 0; if (CPU->state_current == SURF_CPU_ON) action->generic_action.state_set = - surf_workstation_resource->common_public->states. + surf_workstation_model->common_public->states. running_action_set; else action->generic_action.state_set = - surf_workstation_resource->common_public->states.failed_action_set; + surf_workstation_model->common_public->states.failed_action_set; xbt_swag_insert(action, action->generic_action.state_set); action->variable = lmm_variable_new(maxmin_system, action, @@ -546,6 +635,10 @@ static double get_available_speed(void *cpu) return ((cpu_KCCFLN05_t) cpu)->power_current; } +static xbt_dict_t get_property_list(void *cpu) +{ + return ((cpu_KCCFLN05_t) cpu)->properties; +} static surf_action_t communicate(void *src, void *dst, double size, double rate) @@ -572,12 +665,12 @@ static surf_action_t communicate(void *src, void *dst, double size, action->generic_action.finish = -1.0; action->src = src; action->dst = dst; - action->generic_action.resource_type = - (surf_resource_t) surf_workstation_resource; + action->generic_action.model_type = + (surf_model_t) surf_workstation_model; action->suspended = 0; /* Should be useless because of the calloc but it seems to help valgrind... */ action->generic_action.state_set = - surf_workstation_resource->common_public->states.running_action_set; + surf_workstation_model->common_public->states.running_action_set; xbt_dynar_push(card_src->outgoing_communications, &action); xbt_dynar_push(card_dst->incomming_communications, &action); @@ -619,7 +712,7 @@ static surf_action_t communicate(void *src, void *dst, double size, } lmm_update_variable_latency(maxmin_system, action->variable, - action->latency); + action->latency); /* Should be useless */ for (i = 0; i < route_size; i++) lmm_expand(maxmin_system, route->links[i]->constraint, @@ -675,10 +768,6 @@ static surf_action_t execute_parallel_task(int workstation_nb, if (computation_amount[i] > 0) nb_host++; - - if (nb_link + nb_host == 0) /* was workstation_nb... */ - return NULL; - action = xbt_new0(s_surf_action_workstation_KCCFLN05_t, 1); DEBUG3("Creating a parallel task (%p) with %d cpus and %d links.", action, nb_host, nb_link); @@ -686,14 +775,14 @@ static surf_action_t execute_parallel_task(int workstation_nb, action->generic_action.cost = amount; action->generic_action.remains = amount; action->generic_action.max_duration = NO_MAX_DURATION; - action->generic_action.start = -1.0; + action->generic_action.start = surf_get_clock(); action->generic_action.finish = -1.0; - action->generic_action.resource_type = - (surf_resource_t) surf_workstation_resource; + action->generic_action.model_type = + (surf_model_t) surf_workstation_model; action->suspended = 0; /* Should be useless because of the calloc but it seems to help valgrind... */ action->generic_action.state_set = - surf_workstation_resource->common_public->states.running_action_set; + surf_workstation_model->common_public->states.running_action_set; xbt_swag_insert(action, action->generic_action.state_set); action->rate = rate; @@ -730,6 +819,11 @@ static surf_action_t execute_parallel_task(int workstation_nb, } } + if (nb_link + nb_host == 0) { + action->generic_action.cost = 1.0; + action->generic_action.remains = 0.0; + } + return (surf_action_t) action; } @@ -766,6 +860,12 @@ static double get_link_latency(const void *link) return ((network_link_KCCFLN05_t) link)->lat_current; } +static xbt_dict_t get_link_property_list(void *link) +{ + return ((network_link_KCCFLN05_t) link)->properties; +} + + /**************************************/ /*** Resource Creation & Destruction **/ /**************************************/ @@ -779,10 +879,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); @@ -793,7 +893,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) @@ -812,11 +912,12 @@ 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); - cpu->resource = (surf_resource_t) surf_workstation_resource; + cpu->model = (surf_model_t) surf_workstation_model; cpu->type = SURF_WORKSTATION_RESOURCE_CPU; cpu->name = xbt_strdup(name); cpu->id = nb_workstation++; @@ -849,12 +950,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; @@ -866,37 +975,31 @@ 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) @@ -914,12 +1017,12 @@ static network_link_KCCFLN05_t network_link_new(char *name, state_initial, tmgr_trace_t state_trace, e_surf_network_link_sharing_policy_t - policy) + policy, xbt_dict_t network_properties_k) { network_link_KCCFLN05_t nw_link = xbt_new0(s_network_link_KCCFLN05_t, 1); - nw_link->resource = (surf_resource_t) surf_workstation_resource; + nw_link->model = (surf_model_t) surf_workstation_model; nw_link->type = SURF_WORKSTATION_RESOURCE_LINK; nw_link->name = name; nw_link->bw_current = bw_initial; @@ -941,51 +1044,54 @@ static network_link_KCCFLN05_t network_link_new(char *name, if (policy == SURF_NETWORK_LINK_FATPIPE) lmm_constraint_shared(nw_link->constraint); + /*add the property set*/ + nw_link->properties = network_properties_k; + xbt_dict_set(network_link_set, name, nw_link, network_link_free); return nw_link; } -static void parse_network_link(void) +static void parse_network_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_network_link_state_t state_initial_link = SURF_NETWORK_LINK_ON; + e_surf_network_link_sharing_policy_t policy_initial_link = SURF_NETWORK_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_NETWORK_LINK_ON; + else if (A_surfxml_link_state == + A_surfxml_link_state_OFF) + state_initial_link = SURF_NETWORK_LINK_OFF; + + if (A_surfxml_link_sharing_policy == + A_surfxml_link_sharing_policy_SHARED) + policy_initial_link = SURF_NETWORK_LINK_SHARED; + else if (A_surfxml_link_sharing_policy == + A_surfxml_link_sharing_policy_FATPIPE) + policy_initial_link = SURF_NETWORK_LINK_FATPIPE; + + surf_parse_get_trace(&state_trace, A_surfxml_link_state_file); + + current_property_set = xbt_dict_new(); + network_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, @@ -997,12 +1103,12 @@ 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(network_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; @@ -1014,11 +1120,15 @@ 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 = 0; static void parse_route_set_endpoints(void) { cpu_KCCFLN05_t cpu_tmp = NULL; + if (!is_first) create_routing_table(); + is_first = 1; + cpu_tmp = (cpu_KCCFLN05_t) name_service(A_surfxml_route_src); if (cpu_tmp != NULL) { src_id = cpu_tmp->id; @@ -1066,11 +1176,11 @@ static void parse_route_elem(void) } TRY { link_list[nb_link++] = - xbt_dict_get(network_link_set, A_surfxml_route_element_name); + xbt_dict_get(network_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); } } @@ -1080,44 +1190,29 @@ 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) */ + /* Adding callback functions */ surf_parse_reset_parser(); - STag_surfxml_router_fun = parse_routers; + 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_network_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(); - - /* 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 */ - 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; - 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) { @@ -1125,7 +1220,7 @@ static void parse_file(const char *file) loopback = network_link_new(xbt_strdup("__MSG_loopback__"), 498000000, NULL, 0.000015, NULL, SURF_NETWORK_LINK_ON, NULL, - SURF_NETWORK_LINK_FATPIPE); + SURF_NETWORK_LINK_FATPIPE, NULL); ROUTE(i, i).size = 1; ROUTE(i, i).links = xbt_new0(network_link_KCCFLN05_t, 1); ROUTE(i, i).links[0] = loopback; @@ -1137,102 +1232,106 @@ static void parse_file(const char *file) /********* Module creation ***********/ /**************************************/ -static void resource_init_internal(void) +static void model_init_internal(void) { s_surf_action_t action; - surf_workstation_resource = xbt_new0(s_surf_workstation_resource_t, 1); + surf_workstation_model = xbt_new0(s_surf_workstation_model_t, 1); - surf_workstation_resource->common_private = - xbt_new0(s_surf_resource_private_t, 1); - surf_workstation_resource->common_public = - xbt_new0(s_surf_resource_public_t, 1); - surf_workstation_resource->extension_public = - xbt_new0(s_surf_workstation_resource_extension_public_t, 1); + surf_workstation_model->common_private = + xbt_new0(s_surf_model_private_t, 1); + surf_workstation_model->common_public = + xbt_new0(s_surf_model_public_t, 1); + surf_workstation_model->extension_public = + xbt_new0(s_surf_workstation_model_extension_public_t, 1); - surf_workstation_resource->common_public->states.ready_action_set = + surf_workstation_model->common_public->states.ready_action_set = xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_workstation_resource->common_public->states.running_action_set = + surf_workstation_model->common_public->states.running_action_set = xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_workstation_resource->common_public->states.failed_action_set = + surf_workstation_model->common_public->states.failed_action_set = xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_workstation_resource->common_public->states.done_action_set = + surf_workstation_model->common_public->states.done_action_set = xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_workstation_resource->common_public->name_service = name_service; - surf_workstation_resource->common_public->get_resource_name = + surf_workstation_model->common_public->name_service = name_service; + surf_workstation_model->common_public->get_resource_name = get_resource_name; - surf_workstation_resource->common_public->action_get_state = + surf_workstation_model->common_public->action_get_state = surf_action_get_state; - surf_workstation_resource->common_public->action_get_start_time = + surf_workstation_model->common_public->action_get_start_time = surf_action_get_start_time; - surf_workstation_resource->common_public->action_get_finish_time = + surf_workstation_model->common_public->action_get_finish_time = surf_action_get_finish_time; - surf_workstation_resource->common_public->action_use = action_use; - surf_workstation_resource->common_public->action_free = action_free; - surf_workstation_resource->common_public->action_cancel = action_cancel; - surf_workstation_resource->common_public->action_recycle = + surf_workstation_model->common_public->action_use = action_use; + surf_workstation_model->common_public->action_free = action_free; + surf_workstation_model->common_public->action_cancel = action_cancel; + surf_workstation_model->common_public->action_recycle = action_recycle; - surf_workstation_resource->common_public->action_change_state = + surf_workstation_model->common_public->action_change_state = surf_action_change_state; - surf_workstation_resource->common_public->action_set_data = + surf_workstation_model->common_public->action_set_data = surf_action_set_data; - surf_workstation_resource->common_public->suspend = action_suspend; - surf_workstation_resource->common_public->resume = action_resume; - surf_workstation_resource->common_public->is_suspended = + surf_workstation_model->common_public->suspend = action_suspend; + surf_workstation_model->common_public->resume = action_resume; + surf_workstation_model->common_public->is_suspended = action_is_suspended; - surf_workstation_resource->common_public->set_max_duration = + surf_workstation_model->common_public->set_max_duration = action_set_max_duration; - surf_workstation_resource->common_public->set_priority = + surf_workstation_model->common_public->set_priority = action_set_priority; - surf_workstation_resource->common_public->name = "Workstation KCCFLN05"; + surf_workstation_model->common_public->name = "Workstation KCCFLN05"; - surf_workstation_resource->common_private->resource_used = resource_used; - surf_workstation_resource->common_private->share_resources = + surf_workstation_model->common_private->resource_used = resource_used; + surf_workstation_model->common_private->share_resources = share_resources; - surf_workstation_resource->common_private->update_actions_state = + surf_workstation_model->common_private->update_actions_state = update_actions_state; - surf_workstation_resource->common_private->update_resource_state = + surf_workstation_model->common_private->update_resource_state = update_resource_state; - surf_workstation_resource->common_private->finalize = finalize; + surf_workstation_model->common_private->finalize = finalize; - surf_workstation_resource->extension_public->execute = execute; - surf_workstation_resource->extension_public->sleep = action_sleep; - surf_workstation_resource->extension_public->get_state = + surf_workstation_model->extension_public->execute = execute; + surf_workstation_model->extension_public->sleep = action_sleep; + surf_workstation_model->extension_public->get_state = resource_get_state; - surf_workstation_resource->extension_public->get_speed = get_speed; - surf_workstation_resource->extension_public->get_available_speed = + surf_workstation_model->extension_public->get_speed = get_speed; + surf_workstation_model->extension_public->get_available_speed = get_available_speed; - surf_workstation_resource->extension_public->communicate = communicate; - surf_workstation_resource->extension_public->execute_parallel_task = + + surf_workstation_model->common_public->get_cpu_properties = get_property_list; + surf_workstation_model->common_public->get_link_properties = get_link_property_list; + + surf_workstation_model->extension_public->communicate = communicate; + surf_workstation_model->extension_public->execute_parallel_task = execute_parallel_task; - surf_workstation_resource->extension_public->get_route = get_route; - surf_workstation_resource->extension_public->get_route_size = + surf_workstation_model->extension_public->get_route = get_route; + surf_workstation_model->extension_public->get_route_size = get_route_size; - surf_workstation_resource->extension_public->get_link_name = + surf_workstation_model->extension_public->get_link_name = get_link_name; - surf_workstation_resource->extension_public->get_link_bandwidth = + surf_workstation_model->extension_public->get_link_bandwidth = get_link_bandwidth; - surf_workstation_resource->extension_public->get_link_latency = + surf_workstation_model->extension_public->get_link_latency = get_link_latency; workstation_set = xbt_dict_new(); router_set = xbt_dict_new(); - network_link_set = xbt_dict_new(); - - xbt_assert0(maxmin_system, "surf_init has to be called first!"); + network_link_set = xbt_dict_new(); + if (!maxmin_system) + maxmin_system = lmm_system_new(); } /**************************************/ /*************** Generic **************/ /**************************************/ -void surf_workstation_resource_init_KCCFLN05(const char *filename) +void surf_workstation_model_init_KCCFLN05(const char *filename) { - xbt_assert0(!surf_cpu_resource, "CPU resource type already defined"); - xbt_assert0(!surf_network_resource, - "network resource type already defined"); - resource_init_internal(); + xbt_assert0(!surf_cpu_model, "CPU model type already defined"); + xbt_assert0(!surf_network_model, + "network model type already defined"); + model_init_internal(); parse_file(filename); - xbt_dynar_push(resource_list, &surf_workstation_resource); + xbt_dynar_push(model_list, &surf_workstation_model); }