X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4d1afaaa1e4fee55a98707443c05bdbc9abb42c..27680c02b4e665650698b64e4da27bc1cbfc2752:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index b2bba76e1c..531dbbbe58 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -11,46 +11,46 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module"); -surf_network_resource_t surf_network_resource = NULL; +surf_network_model_t surf_network_model = NULL; static lmm_system_t network_maxmin_system = NULL; static void (*network_solve) (lmm_system_t) = NULL; -xbt_dict_t network_link_set = NULL; +xbt_dict_t link_set = NULL; xbt_dict_t network_card_set = NULL; int card_number = 0; -network_link_CM02_t **routing_table = NULL; +link_CM02_t **routing_table = NULL; int *routing_table_size = NULL; -static network_link_CM02_t loopback = NULL; +static link_CM02_t loopback = NULL; static void create_routing_table(void) { routing_table = - xbt_new0(network_link_CM02_t *, card_number * card_number); + xbt_new0(link_CM02_t *, card_number * card_number); routing_table_size = xbt_new0(int, card_number * card_number); } -static void network_link_free(void *nw_link) +static void link_free(void *nw_link) { - free(((network_link_CM02_t) nw_link)->name); + free(((link_CM02_t) nw_link)->name); free(nw_link); } -static network_link_CM02_t network_link_new(char *name, +static link_CM02_t 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 + e_surf_link_state_t state_initial, tmgr_trace_t state_trace, - e_surf_network_link_sharing_policy_t - policy) + e_surf_link_sharing_policy_t + policy, xbt_dict_t properties) { - network_link_CM02_t nw_link = xbt_new0(s_network_link_CM02_t, 1); + link_CM02_t nw_link = xbt_new0(s_link_CM02_t, 1); - nw_link->resource = (surf_resource_t) surf_network_resource; + nw_link->model = (surf_model_t) surf_network_model; nw_link->name = name; nw_link->bw_current = bw_initial; if (bw_trace) @@ -69,10 +69,14 @@ static network_link_CM02_t network_link_new(char *name, lmm_constraint_new(network_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); + nw_link->properties = properties; + + current_property_set = properties; + + xbt_dict_set(link_set, name, nw_link, link_free); return nw_link; } @@ -98,80 +102,82 @@ static int network_card_new(const char *card_name) } static void route_new(int src_id, int dst_id, - network_link_CM02_t * link_list, int nb_link) + link_CM02_t * link_list, int nb_link) { ROUTE_SIZE(src_id, dst_id) = nb_link; ROUTE(src_id, dst_id) = link_list = - xbt_realloc(link_list, sizeof(network_link_CM02_t) * nb_link); + xbt_realloc(link_list, sizeof(link_CM02_t) * nb_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); + 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; - 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_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; - 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_link_state_file); - surf_parse_get_trace(&state_trace, A_surfxml_network_link_state_file); + link_new(name_link, bw_initial, bw_trace, + lat_initial, lat_trace, state_initial_link, state_trace, + policy_initial_link, xbt_dict_new()); - network_link_new(name, bw_initial, bw_trace, - lat_initial, lat_trace, state_initial, state_trace, - policy_initial); } static int nb_link; static int link_list_capacity; -static network_link_CM02_t *link_list = NULL; +static link_CM02_t *link_list = NULL; static int src_id = -1; static int dst_id = -1; static void parse_route_set_endpoints(void) { + src_id = network_card_new(A_surfxml_route_src); dst_id = network_card_new(A_surfxml_route_dst); nb_link = 0; link_list_capacity = 20; - link_list = xbt_new(network_link_CM02_t, link_list_capacity); + link_list = xbt_new(link_CM02_t, link_list_capacity); } static void parse_route_elem(void) { + if (nb_link == link_list_capacity) { link_list_capacity *= 2; link_list = xbt_realloc(link_list, - (link_list_capacity) * sizeof(network_link_CM02_t)); + (link_list_capacity) * sizeof(link_CM02_t)); } link_list[nb_link++] = - xbt_dict_get_or_null(network_link_set, A_surfxml_route_element_name); + xbt_dict_get_or_null(link_set, A_surfxml_link_c_ctn_id); } static void parse_route_set_route(void) @@ -182,17 +188,17 @@ static void parse_route_set_route(void) static void parse_file(const char *file) { int i; - /* Figuring out the network links */ surf_parse_reset_parser(); - ETag_surfxml_network_link_fun = parse_network_link; + surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init); + surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties); surf_parse_open(file); xbt_assert1((!surf_parse()), "Parse error in %s", file); surf_parse_close(); /* Figuring out the network cards used */ surf_parse_reset_parser(); - STag_surfxml_route_fun = parse_route_set_endpoints; + surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints); surf_parse_open(file); xbt_assert1((!surf_parse()), "Parse error in %s", file); surf_parse_close(); @@ -201,9 +207,9 @@ static void parse_file(const char *file) /* 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; + 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); surf_parse_open(file); xbt_assert1((!surf_parse()), "Parse error in %s", file); surf_parse_close(); @@ -213,12 +219,12 @@ static void parse_file(const char *file) for (i = 0; i < card_number; i++) if (!ROUTE_SIZE(i, i)) { 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_SIZE(i, i) = 1; - ROUTE(i, i) = xbt_new0(network_link_CM02_t, 1); + ROUTE(i, i) = xbt_new0(link_CM02_t, 1); ROUTE(i, i)[0] = loopback; } } @@ -237,7 +243,7 @@ static const char *get_resource_name(void *resource_id) static int resource_used(void *resource_id) { return lmm_constraint_used(network_maxmin_system, - ((network_link_CM02_t) resource_id)-> + ((link_CM02_t) resource_id)-> constraint); } @@ -288,14 +294,14 @@ static double share_resources(double now) s_surf_action_network_CM02_t s_action; surf_action_network_CM02_t action = NULL; xbt_swag_t running_actions = - surf_network_resource->common_public->states.running_action_set; + surf_network_model->common_public->states.running_action_set; double min; - min = generic_maxmin_share_resources2(running_actions, - xbt_swag_offset(s_action, - variable), - network_maxmin_system, - network_solve); + min = generic_maxmin_share_resources(running_actions, + xbt_swag_offset(s_action, + variable), + network_maxmin_system, + network_solve); xbt_swag_foreach(action, running_actions) { if (action->latency > 0) { @@ -315,10 +321,10 @@ static void update_actions_state(double now, double delta) surf_action_network_CM02_t action = NULL; surf_action_network_CM02_t next_action = NULL; xbt_swag_t running_actions = - surf_network_resource->common_public->states.running_action_set; + surf_network_model->common_public->states.running_action_set; /* xbt_swag_t failed_actions = - surf_network_resource->common_public->states.failed_action_set; + surf_network_model->common_public->states.failed_action_set; */ xbt_swag_foreach_safe(action, next_action, running_actions) { @@ -350,16 +356,16 @@ static void update_actions_state(double now, double delta) (action->generic_action.max_duration <= 0)) { action->generic_action.finish = surf_get_clock(); action_change_state((surf_action_t) action, SURF_ACTION_DONE); - } else { /* Need to check that none of the resource has failed */ + } else { /* Need to check that none of the model has failed */ lmm_constraint_t cnst = NULL; int i = 0; - network_link_CM02_t nw_link = NULL; + link_CM02_t nw_link = NULL; while ((cnst = lmm_get_cnst_from_var(network_maxmin_system, action->variable, i++))) { nw_link = lmm_constraint_id(cnst); - if (nw_link->state_current == SURF_NETWORK_LINK_OFF) { + if (nw_link->state_current == SURF_LINK_OFF) { action->generic_action.finish = surf_get_clock(); action_change_state((surf_action_t) action, SURF_ACTION_FAILED); break; @@ -375,7 +381,7 @@ static void update_resource_state(void *id, tmgr_trace_event_t event_type, double value) { - network_link_CM02_t nw_link = id; + link_CM02_t nw_link = id; /* printf("[" "%lg" "] Asking to update network card \"%s\" with value " */ /* "%lg" " for event %p\n", surf_get_clock(), nw_link->name, */ /* value, event_type); */ @@ -413,9 +419,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(); @@ -431,7 +437,7 @@ static surf_action_t communicate(void *src, void *dst, double size, network_card_CM02_t card_src = src; network_card_CM02_t card_dst = dst; int route_size = ROUTE_SIZE(card_src->id, card_dst->id); - network_link_CM02_t *route = ROUTE(card_src->id, card_dst->id); + link_CM02_t *route = ROUTE(card_src->id, card_dst->id); int i; XBT_IN4("(%s,%s,%g,%g)", card_src->name, card_dst->name, size, rate); @@ -447,12 +453,12 @@ static surf_action_t communicate(void *src, void *dst, 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_network_resource; + action->generic_action.model_type = + (surf_model_t) surf_network_model; action->suspended = 0; /* Should be useless because of the calloc but it seems to help valgrind... */ action->generic_action.state_set = - surf_network_resource->common_public->states.running_action_set; + surf_network_model->common_public->states.running_action_set; xbt_swag_insert(action, action->generic_action.state_set); action->rate = rate; @@ -490,7 +496,7 @@ static surf_action_t communicate(void *src, void *dst, double size, lmm_update_variable_bound(network_maxmin_system, action->variable, action->rate); } - lmm_update_variable_latency(maxmin_system, action->variable, + lmm_update_variable_latency(network_maxmin_system, action->variable, action->latency); for (i = 0; i < route_size; i++) @@ -501,7 +507,7 @@ static surf_action_t communicate(void *src, void *dst, double size, return (surf_action_t) action; } -/* returns an array of network_link_CM02_t */ +/* returns an array of link_CM02_t */ static const void **get_route(void *src, void *dst) { network_card_CM02_t card_src = src; @@ -518,17 +524,22 @@ static int get_route_size(void *src, void *dst) static const char *get_link_name(const void *link) { - return ((network_link_CM02_t) link)->name; + return ((link_CM02_t) link)->name; } static double get_link_bandwidth(const void *link) { - return ((network_link_CM02_t) link)->bw_current; + return ((link_CM02_t) link)->bw_current; } static double get_link_latency(const void *link) { - return ((network_link_CM02_t) link)->lat_current; + return ((link_CM02_t) link)->lat_current; +} + +static xbt_dict_t get_properties(void *link) +{ + return ((link_CM02_t) link)->properties; } static void action_suspend(surf_action_t action) @@ -566,21 +577,21 @@ static void finalize(void) int i, j; xbt_dict_free(&network_card_set); - xbt_dict_free(&network_link_set); - xbt_swag_free(surf_network_resource->common_public->states. + xbt_dict_free(&link_set); + xbt_swag_free(surf_network_model->common_public->states. ready_action_set); - xbt_swag_free(surf_network_resource->common_public->states. + xbt_swag_free(surf_network_model->common_public->states. running_action_set); - xbt_swag_free(surf_network_resource->common_public->states. + xbt_swag_free(surf_network_model->common_public->states. failed_action_set); - xbt_swag_free(surf_network_resource->common_public->states. + xbt_swag_free(surf_network_model->common_public->states. done_action_set); - free(surf_network_resource->common_public); - free(surf_network_resource->common_private); - free(surf_network_resource->extension_public); + free(surf_network_model->common_public); + free(surf_network_model->common_private); + free(surf_network_model->extension_public); - free(surf_network_resource); - surf_network_resource = NULL; + free(surf_network_model); + surf_network_model = NULL; loopback = NULL; for (i = 0; i < card_number; i++) @@ -593,71 +604,73 @@ static void finalize(void) card_number = 0; } -static void surf_network_resource_init_internal(void) +static void surf_network_model_init_internal(void) { s_surf_action_t action; - surf_network_resource = xbt_new0(s_surf_network_resource_t, 1); + surf_network_model = xbt_new0(s_surf_network_model_t, 1); - surf_network_resource->common_private = - xbt_new0(s_surf_resource_private_t, 1); - surf_network_resource->common_public = - xbt_new0(s_surf_resource_public_t, 1); - surf_network_resource->extension_public = - xbt_new0(s_surf_network_resource_extension_public_t, 1); + surf_network_model->common_private = + xbt_new0(s_surf_model_private_t, 1); + surf_network_model->common_public = + xbt_new0(s_surf_model_public_t, 1); + surf_network_model->extension_public = + xbt_new0(s_surf_network_model_extension_public_t, 1); - surf_network_resource->common_public->states.ready_action_set = + surf_network_model->common_public->states.ready_action_set = xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_network_resource->common_public->states.running_action_set = + surf_network_model->common_public->states.running_action_set = xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_network_resource->common_public->states.failed_action_set = + surf_network_model->common_public->states.failed_action_set = xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_network_resource->common_public->states.done_action_set = + surf_network_model->common_public->states.done_action_set = xbt_swag_new(xbt_swag_offset(action, state_hookup)); - surf_network_resource->common_public->name_service = name_service; - surf_network_resource->common_public->get_resource_name = + surf_network_model->common_public->name_service = name_service; + surf_network_model->common_public->get_resource_name = get_resource_name; - surf_network_resource->common_public->action_get_state = + surf_network_model->common_public->action_get_state = surf_action_get_state; - surf_network_resource->common_public->action_get_start_time = + surf_network_model->common_public->action_get_start_time = surf_action_get_start_time; - surf_network_resource->common_public->action_get_finish_time = + surf_network_model->common_public->action_get_finish_time = surf_action_get_finish_time; - surf_network_resource->common_public->action_free = action_free; - surf_network_resource->common_public->action_use = action_use; - surf_network_resource->common_public->action_cancel = action_cancel; - surf_network_resource->common_public->action_recycle = action_recycle; - surf_network_resource->common_public->action_change_state = + surf_network_model->common_public->action_free = action_free; + surf_network_model->common_public->action_use = action_use; + surf_network_model->common_public->action_cancel = action_cancel; + surf_network_model->common_public->action_recycle = action_recycle; + surf_network_model->common_public->action_change_state = action_change_state; - surf_network_resource->common_public->action_set_data = + surf_network_model->common_public->action_set_data = surf_action_set_data; - surf_network_resource->common_public->name = "network"; + surf_network_model->common_public->name = "network"; - surf_network_resource->common_private->resource_used = resource_used; - surf_network_resource->common_private->share_resources = share_resources; - surf_network_resource->common_private->update_actions_state = + surf_network_model->common_private->resource_used = resource_used; + surf_network_model->common_private->share_resources = share_resources; + surf_network_model->common_private->update_actions_state = update_actions_state; - surf_network_resource->common_private->update_resource_state = + surf_network_model->common_private->update_resource_state = update_resource_state; - surf_network_resource->common_private->finalize = finalize; + surf_network_model->common_private->finalize = finalize; - surf_network_resource->common_public->suspend = action_suspend; - surf_network_resource->common_public->resume = action_resume; - surf_network_resource->common_public->is_suspended = action_is_suspended; - surf_cpu_resource->common_public->set_max_duration = + surf_network_model->common_public->suspend = action_suspend; + surf_network_model->common_public->resume = action_resume; + surf_network_model->common_public->is_suspended = action_is_suspended; + surf_cpu_model->common_public->set_max_duration = action_set_max_duration; - surf_network_resource->extension_public->communicate = communicate; - surf_network_resource->extension_public->get_route = get_route; - surf_network_resource->extension_public->get_route_size = get_route_size; - surf_network_resource->extension_public->get_link_name = get_link_name; - surf_network_resource->extension_public->get_link_bandwidth = + surf_network_model->extension_public->communicate = communicate; + surf_network_model->extension_public->get_route = get_route; + surf_network_model->extension_public->get_route_size = get_route_size; + surf_network_model->extension_public->get_link_name = get_link_name; + surf_network_model->extension_public->get_link_bandwidth = get_link_bandwidth; - surf_network_resource->extension_public->get_link_latency = + surf_network_model->extension_public->get_link_latency = get_link_latency; - network_link_set = xbt_dict_new(); + surf_network_model->common_public->get_properties = get_properties; + + link_set = xbt_dict_new(); network_card_set = xbt_dict_new(); if (!network_maxmin_system) @@ -675,72 +688,72 @@ static void surf_network_resource_init_internal(void) /* month = {oct}, */ /* year = {2002} */ /* } */ -void surf_network_resource_init_CM02(const char *filename) +void surf_network_model_init_CM02(const char *filename) { - if (surf_network_resource) + if (surf_network_model) return; - surf_network_resource_init_internal(); + surf_network_model_init_internal(); parse_file(filename); - xbt_dynar_push(resource_list, &surf_network_resource); + xbt_dynar_push(model_list, &surf_network_model); network_solve = lmm_solve; - update_resource_description(surf_network_resource_description, - surf_network_resource_description_size, + update_model_description(surf_network_model_description, + surf_network_model_description_size, "CM02", - (surf_resource_t) surf_network_resource); + (surf_model_t) surf_network_model); } -void surf_network_resource_init_Reno(const char *filename) +void surf_network_model_init_Reno(const char *filename) { - if (surf_network_resource) + if (surf_network_model) return; - surf_network_resource_init_internal(); + surf_network_model_init_internal(); parse_file(filename); - xbt_dynar_push(resource_list, &surf_network_resource); + xbt_dynar_push(model_list, &surf_network_model); lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); network_solve = lagrange_solve; - update_resource_description(surf_network_resource_description, - surf_network_resource_description_size, + update_model_description(surf_network_model_description, + surf_network_model_description_size, "Reno", - (surf_resource_t) surf_network_resource); + (surf_model_t) surf_network_model); } -void surf_network_resource_init_Vegas(const char *filename) +void surf_network_model_init_Vegas(const char *filename) { - if (surf_network_resource) + if (surf_network_model) return; - surf_network_resource_init_internal(); + surf_network_model_init_internal(); parse_file(filename); - xbt_dynar_push(resource_list, &surf_network_resource); + xbt_dynar_push(model_list, &surf_network_model); lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi); network_solve = lagrange_solve; - update_resource_description(surf_network_resource_description, - surf_network_resource_description_size, + update_model_description(surf_network_model_description, + surf_network_model_description_size, "Vegas", - (surf_resource_t) surf_network_resource); + (surf_model_t) surf_network_model); } #ifdef HAVE_SDP -void surf_network_resource_init_SDP(const char *filename) +void surf_network_model_init_SDP(const char *filename) { - if (surf_network_resource) + if (surf_network_model) return; - surf_network_resource_init_internal(); + surf_network_model_init_internal(); parse_file(filename); - xbt_dynar_push(resource_list, &surf_network_resource); + xbt_dynar_push(model_list, &surf_network_model); network_solve = sdp_solve; - update_resource_description(surf_network_resource_description, - surf_network_resource_description_size, + update_model_description(surf_network_model_description, + surf_network_model_description_size, "SDP", - (surf_resource_t) surf_network_resource); + (surf_model_t) surf_network_model); } #endif