From a3141b2111e49b104c2c6b59fe9e61146a688d38 Mon Sep 17 00:00:00 2001 From: mquinson Date: Fri, 26 Oct 2007 20:38:57 +0000 Subject: [PATCH] Propagate the s/network_link/link/ from the XML to the C code (hope I didn't break anything) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4890 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/include/surf/surf.h | 4 +- src/simdag/sd_global.c | 2 +- src/surf/network.c | 92 +++++++++++----------- src/surf/network_gtnets.c | 62 +++++++-------- src/surf/network_private.h | 6 +- src/surf/surf_private.h | 12 +-- src/surf/workstation_KCCFLN05.c | 124 +++++++++++++++--------------- src/surf/workstation_ptask_L07.c | 126 +++++++++++++++---------------- 8 files changed, 214 insertions(+), 214 deletions(-) diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index fb139cb8b3..db89c27b1d 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -484,14 +484,14 @@ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_description[] * * \see workstation_set */ -XBT_PUBLIC_DATA(xbt_dict_t) network_link_set; +XBT_PUBLIC_DATA(xbt_dict_t) link_set; /** \brief The workstations * \ingroup SURF_models * * This dict contains all workstations. * - * \see network_link_set + * \see link_set */ XBT_PUBLIC_DATA(xbt_dict_t) workstation_set; diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c index d439547bbb..a080aa780a 100644 --- a/src/simdag/sd_global.c +++ b/src/simdag/sd_global.c @@ -366,7 +366,7 @@ void SD_create_environment(const char *platform_file) { __SD_workstation_create(surf_workstation, NULL); } - xbt_dict_foreach(network_link_set, cursor, name, surf_link) { + xbt_dict_foreach(link_set, cursor, name, surf_link) { __SD_link_create(surf_link, NULL); } diff --git a/src/surf/network.c b/src/surf/network.c index 488183322b..4bcb3da4bd 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -15,39 +15,39 @@ 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 + 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->model = (surf_model_t) surf_network_model; @@ -69,14 +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); nw_link->properties = properties; current_property_set = properties; - xbt_dict_set(network_link_set, name, nw_link, network_link_free); + xbt_dict_set(link_set, name, nw_link, link_free); return nw_link; } @@ -102,22 +102,22 @@ 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_init(void) +static void parse_link_init(void) { 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_link = SURF_NETWORK_LINK_ON; - e_surf_network_link_sharing_policy_t policy_initial_link = 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_link = xbt_strdup(A_surfxml_link_id); @@ -131,21 +131,21 @@ static void parse_network_link_init(void) || (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; + state_initial_link = SURF_LINK_ON; else if (A_surfxml_link_state == A_surfxml_link_state_OFF) - state_initial_link = SURF_NETWORK_LINK_OFF; + state_initial_link = SURF_LINK_OFF; if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED) - policy_initial_link = SURF_NETWORK_LINK_SHARED; + policy_initial_link = SURF_LINK_SHARED; else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE) - policy_initial_link = SURF_NETWORK_LINK_FATPIPE; + policy_initial_link = SURF_LINK_FATPIPE; surf_parse_get_trace(&state_trace, A_surfxml_link_state_file); - network_link_new(name_link, bw_initial, bw_trace, + link_new(name_link, bw_initial, bw_trace, lat_initial, lat_trace, state_initial_link, state_trace, policy_initial_link, xbt_dict_new()); @@ -153,7 +153,7 @@ static void parse_network_link_init(void) 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; /* @@ -167,7 +167,7 @@ static void parse_route_set_endpoints(void) 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) @@ -177,10 +177,10 @@ static void parse_route_elem(void) 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_link_c_ctn_id); + xbt_dict_get_or_null(link_set, A_surfxml_link_c_ctn_id); } static void parse_route_set_route(void) @@ -193,14 +193,14 @@ static void parse_file(const char *file) int i; /* surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties); - surfxml_add_callback(STag_surfxml_link_cb_list, &parse_network_link_init); + 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); */ /* Figuring out the network links */ surf_parse_reset_parser(); - surfxml_add_callback(STag_surfxml_link_cb_list, &parse_network_link_init); + 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); @@ -229,12 +229,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,NULL); + 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; } } @@ -253,7 +253,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); } @@ -369,13 +369,13 @@ static void update_actions_state(double now, double delta) } 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; @@ -391,7 +391,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); */ @@ -429,9 +429,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(); @@ -447,7 +447,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); @@ -517,7 +517,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; @@ -534,22 +534,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_link_property_list(void *link) { - return ((network_link_CM02_t) link)->properties; + return ((link_CM02_t) link)->properties; } static void action_suspend(surf_action_t action) @@ -587,7 +587,7 @@ static void finalize(void) int i, j; xbt_dict_free(&network_card_set); - xbt_dict_free(&network_link_set); + xbt_dict_free(&link_set); xbt_swag_free(surf_network_model->common_public->states. ready_action_set); xbt_swag_free(surf_network_model->common_public->states. @@ -680,7 +680,7 @@ static void surf_network_model_init_internal(void) /*for the props of the link*/ surf_network_model->common_public->get_link_properties = get_link_property_list; - network_link_set = xbt_dict_new(); + link_set = xbt_dict_new(); network_card_set = xbt_dict_new(); if (!network_maxmin_system) diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c index e1ba8706e0..758ef59a94 100644 --- a/src/surf/network_gtnets.c +++ b/src/surf/network_gtnets.c @@ -12,13 +12,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets, surf, "Logging specific to the SURF network module"); /* surf_network_model_t surf_network_model = NULL; */ -/*static xbt_dict_t network_link_set = NULL;*/ +/*static xbt_dict_t link_set = NULL;*/ /* xbt_dict_t network_card_set = NULL; */ #if 0 static int card_number = 0; -static network_link_GTNETS_t **routing_table = NULL; +static link_GTNETS_t **routing_table = NULL; static int *routing_table_size = NULL; #define ROUTE(i,j) routing_table[(i)+(j)*card_number] @@ -36,9 +36,9 @@ static int *routing_table_size = NULL; **/ /* Free memory for a network link */ -static void network_link_free(void *nw_link) +static void link_free(void *nw_link) { - free(((network_link_GTNETS_t) nw_link)->name); + free(((link_GTNETS_t) nw_link)->name); free(nw_link); } @@ -46,13 +46,13 @@ static void network_link_free(void *nw_link) /* name: some name for the link, from the XML */ /* bw: The bandwidth value */ /* lat: The latency value */ -static void network_link_new(char *name, double bw, double lat, xbt_dict_t props) +static void link_new(char *name, double bw, double lat, xbt_dict_t props) { static int link_count = -1; - network_link_GTNETS_t gtnets_link; + link_GTNETS_t gtnets_link; /* KF: Check that the link wasn't added before */ - if (xbt_dict_get_or_null(network_link_set, name)) { + if (xbt_dict_get_or_null(link_set, name)) { return; } @@ -82,7 +82,7 @@ static void network_link_new(char *name, double bw, double lat, xbt_dict_t props } /* KF: Insert entry in the dictionary */ - gtnets_link = xbt_new0(s_network_link_GTNETS_t, 1); + gtnets_link = xbt_new0(s_link_GTNETS_t, 1); gtnets_link->name = name; gtnets_link->bw_current = bw; gtnets_link->lat_current = lat; @@ -90,7 +90,7 @@ static void network_link_new(char *name, double bw, double lat, xbt_dict_t props /* Add the properties */ gtnets_link->properties = current_property_set; - xbt_dict_set(network_link_set, name, gtnets_link, network_link_free); + xbt_dict_set(link_set, name, gtnets_link, link_free); return; } @@ -130,14 +130,14 @@ static int network_card_new(const char *name) static void route_new(int src_id, int dst_id, char **links, int nb_link) { #if 0 - network_link_GTNETS_t *link_list = NULL; + link_GTNETS_t *link_list = NULL; int i; ROUTE_SIZE(src_id, dst_id) = nb_link; link_list = (ROUTE(src_id, dst_id) = - xbt_new0(network_link_GTNETS_t, nb_link)); + xbt_new0(link_GTNETS_t, nb_link)); for (i = 0; i < nb_link; i++) { - link_list[i] = xbt_dict_get_or_null(network_link_set, links[i]); + link_list[i] = xbt_dict_get_or_null(link_set, links[i]); free(links[i]); } free(links); @@ -149,8 +149,8 @@ static void route_new(int src_id, int dst_id, char **links, int nb_link) gtnets_links = (int *) calloc(nb_link, sizeof(int)); for (i = 0; i < nb_link; i++) { gtnets_links[i] = - ((network_link_GTNETS_t) - (xbt_dict_get(network_link_set, links[i])))->id; + ((link_GTNETS_t) + (xbt_dict_get(link_set, links[i])))->id; } /* KF: Create the GTNets route */ @@ -171,8 +171,8 @@ static void route_onehop_new(int src_id, int dst_id, char **links, /* KF: Build the list of gtnets link IDs */ linkid = - ((network_link_GTNETS_t) - (xbt_dict_get(network_link_set, links[0])))->id; + ((link_GTNETS_t) + (xbt_dict_get(link_set, links[0])))->id; /* KF: Create the GTNets route */ if (gtnets_add_onehop_route(src_id, dst_id, linkid)) { @@ -183,17 +183,17 @@ static void route_onehop_new(int src_id, int dst_id, char **links, /* Parse the XML for a network link */ -static void parse_network_link_init(void) +static void parse_link_init(void) { char *name; double bw; double lat; - e_surf_network_link_state_t state; + e_surf_link_state_t state; - name = xbt_strdup(A_surfxml_network_link_name); - surf_parse_get_double(&bw, A_surfxml_network_link_bandwidth); - surf_parse_get_double(&lat, A_surfxml_network_link_latency); - state = SURF_NETWORK_LINK_ON; + name = xbt_strdup(A_surfxml_link_name); + surf_parse_get_double(&bw, A_surfxml_link_bandwidth); + surf_parse_get_double(&lat, A_surfxml_link_latency); + state = SURF_link_ON; /* Print values when no traces are specified */ { @@ -201,9 +201,9 @@ static void parse_network_link_init(void) tmgr_trace_t state_trace; tmgr_trace_t lat_trace; - surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file); - surf_parse_get_trace(&lat_trace, A_surfxml_network_link_latency_file); - surf_parse_get_trace(&state_trace, A_surfxml_network_link_state_file); + surf_parse_get_trace(&bw_trace, A_surfxml_link_bandwidth_file); + surf_parse_get_trace(&lat_trace, A_surfxml_link_latency_file); + surf_parse_get_trace(&state_trace, A_surfxml_link_state_file); /*TODO Where is WARNING0 defined??? */ #if 0 @@ -218,9 +218,9 @@ static void parse_network_link_init(void) ("The GTNetS network model doesn't support link state traces"); #endif } - /* KF: remove several arguments to network_link_new */ + /* KF: remove several arguments to link_new */ current_property_set = xbt_dict_new(); - network_link_new(name, bw, lat, current_property_set); + link_new(name, bw, lat, current_property_set); } static int nb_link = 0; @@ -277,7 +277,7 @@ static void parse_file(const char *file) surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties); surfxml_add_callback(STag_surfxml_router_cb_list, &parse_route_set_routers); - surfxml_add_callback(STag_surfxml_network_link_cb_list, &parse_network_link_init); + 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_route_element_cb_list, &parse_route_elem); surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_onehop_route); @@ -443,7 +443,7 @@ static surf_action_t communicate(void *src, void *dst, double size, network_card_GTNETS_t card_dst = dst; /* int route_size = ROUTE_SIZE(card_src->id, card_dst->id); - network_link_GTNETS_t *route = ROUTE(card_src->id, card_dst->id); + link_GTNETS_t *route = ROUTE(card_src->id, card_dst->id); */ /* @@ -503,7 +503,7 @@ static void finalize(void) int i, j; #endif xbt_dict_free(&network_card_set); - xbt_dict_free(&network_link_set); + xbt_dict_free(&link_set); xbt_swag_free(surf_network_model->common_public->states. ready_action_set); xbt_swag_free(surf_network_model->common_public->states. @@ -589,7 +589,7 @@ static void surf_network_model_init_internal(void) /*for the props of the link*/ surf_network_model->common_public->get_link_properties = get_link_property_list; - network_link_set = xbt_dict_new(); + link_set = xbt_dict_new(); network_card_set = xbt_dict_new(); /* KF: Added the initialization for GTNetS interface */ diff --git a/src/surf/network_private.h b/src/surf/network_private.h index 4cc3cf0529..e6c50cc87f 100644 --- a/src/surf/network_private.h +++ b/src/surf/network_private.h @@ -21,12 +21,12 @@ typedef struct network_link_CM02 { tmgr_trace_event_t bw_event; double lat_current; tmgr_trace_event_t lat_event; - e_surf_network_link_state_t state_current; + e_surf_link_state_t state_current; tmgr_trace_event_t state_event; lmm_constraint_t constraint; /*holds the properties associated with a link*/ xbt_dict_t properties; -} s_network_link_CM02_t, *network_link_CM02_t; +} s_link_CM02_t, *link_CM02_t; typedef struct network_card_CM02 { @@ -49,7 +49,7 @@ extern xbt_dict_t network_card_set; extern int card_number; -extern network_link_CM02_t **routing_table; +extern link_CM02_t **routing_table; extern int *routing_table_size; #define ROUTE(i,j) routing_table[(i)+(j)*card_number] diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index e417d40497..a2c6654701 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -22,14 +22,14 @@ xbt_dict_t current_property_set; extern const char *surf_action_state_names[6]; typedef enum { - SURF_NETWORK_LINK_ON = 1, /* Ready */ - SURF_NETWORK_LINK_OFF = 0 /* Running */ -} e_surf_network_link_state_t; + SURF_LINK_ON = 1, /* Ready */ + SURF_LINK_OFF = 0 /* Running */ +} e_surf_link_state_t; typedef enum { - SURF_NETWORK_LINK_SHARED = 1, - SURF_NETWORK_LINK_FATPIPE = 0 -} e_surf_network_link_sharing_policy_t; + SURF_LINK_SHARED = 1, + SURF_LINK_FATPIPE = 0 +} e_surf_link_sharing_policy_t; typedef struct surf_model_private { int (*resource_used) (void *resource_id); diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c index b1a5ff5938..a160669c03 100644 --- a/src/surf/workstation_KCCFLN05.c +++ b/src/surf/workstation_KCCFLN05.c @@ -55,7 +55,7 @@ typedef struct cpu_KCCFLN05 { /*********** network object ***********/ /**************************************/ -typedef struct network_link_KCCFLN05 { +typedef struct 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 */ @@ -64,11 +64,11 @@ typedef struct network_link_KCCFLN05 { 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; /*holds the properties that can be attached to the link*/ xbt_dict_t properties; -} s_network_link_KCCFLN05_t, *network_link_KCCFLN05_t; +} s_link_KCCFLN05_t, *link_KCCFLN05_t; typedef struct s_route_KCCFLN05 { @@ -76,7 +76,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; @@ -100,12 +100,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 */ @@ -189,7 +189,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; } @@ -316,7 +316,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) @@ -328,7 +328,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); } @@ -419,11 +419,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) { */ @@ -433,10 +433,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 == @@ -458,7 +458,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); @@ -497,9 +497,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(); @@ -530,11 +530,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); @@ -739,8 +739,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); } @@ -750,18 +750,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++) @@ -806,7 +806,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++) { @@ -827,7 +827,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; @@ -847,22 +847,22 @@ 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_property_list(void *link) { - return ((network_link_KCCFLN05_t) link)->properties; + return ((link_KCCFLN05_t) link)->properties; } @@ -1002,24 +1002,24 @@ static void parse_cpu_init(void) 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, +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_network_link_state_t + e_surf_link_state_t state_initial, tmgr_trace_t state_trace, - e_surf_network_link_sharing_policy_t + e_surf_link_sharing_policy_t policy, xbt_dict_t network_properties_k) { - 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; @@ -1041,26 +1041,26 @@ 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); /*add the property set*/ nw_link->properties = network_properties_k; - xbt_dict_set(network_link_set, name, nw_link, network_link_free); + xbt_dict_set(link_set, name, nw_link, link_free); return nw_link; } -static void parse_network_link_init(void) +static void parse_link_init(void) { 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_link = SURF_NETWORK_LINK_ON; - e_surf_network_link_sharing_policy_t policy_initial_link = 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_link = xbt_strdup(A_surfxml_link_id); @@ -1074,28 +1074,28 @@ static void parse_network_link_init(void) || (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; + state_initial_link = SURF_LINK_ON; else if (A_surfxml_link_state == A_surfxml_link_state_OFF) - state_initial_link = SURF_NETWORK_LINK_OFF; + state_initial_link = SURF_LINK_OFF; if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED) - policy_initial_link = SURF_NETWORK_LINK_SHARED; + policy_initial_link = SURF_LINK_SHARED; else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE) - policy_initial_link = SURF_NETWORK_LINK_FATPIPE; + policy_initial_link = SURF_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, + 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) @@ -1103,7 +1103,7 @@ 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_dst; route->impact_on_src_with_other_recv = impact_on_src_with_other_recv; @@ -1113,7 +1113,7 @@ static void route_new(int src_id, int dst_id, 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; @@ -1160,7 +1160,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); } @@ -1172,11 +1172,11 @@ 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_link_c_ctn_id); + xbt_dict_get(link_set, A_surfxml_link_c_ctn_id); } CATCH(e) { RETHROW1("Link %s not found (dict raised this exception: %s)", @@ -1203,7 +1203,7 @@ static void parse_file(const char *file) 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_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); @@ -1217,12 +1217,12 @@ static void parse_file(const char *file) 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, NULL); + 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; } @@ -1317,7 +1317,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(); } diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index 8e4711a70a..774d540c13 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -36,7 +36,7 @@ typedef struct cpu_L07 { /*********** network object ***********/ /**************************************/ -typedef struct network_link_L07 { +typedef struct link_L07 { surf_model_t model; /* Do not move this field */ e_surf_workstation_model_type_t type; /* Do not move this field */ char *name; /* Do not move this field */ @@ -45,15 +45,15 @@ typedef struct network_link_L07 { 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; /*holds the property list that can be associated with the link*/ xbt_dict_t properties; -} s_network_link_L07_t, *network_link_L07_t; +} s_link_L07_t, *link_L07_t; typedef struct s_route_L07 { - network_link_L07_t *links; + link_L07_t *links; int size; } s_route_L07_t, *route_L07_t; @@ -78,8 +78,8 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_workstation); static int nb_workstation = 0; static s_route_L07_t *routing_table = NULL; #define ROUTE(i,j) routing_table[(i)+(j)*nb_workstation] -static network_link_L07_t loopback = NULL; -static xbt_dict_t parallel_task_network_link_set = NULL; +static link_L07_t loopback = NULL; +static xbt_dict_t parallel_task_link_set = NULL; lmm_system_t ptask_maxmin_system = NULL; @@ -95,7 +95,7 @@ static void update_action_bound(surf_action_workstation_L07_t action) cpu_L07_t card_src = action->workstation_list[i]; cpu_L07_t card_dst = action->workstation_list[j]; int route_size = ROUTE(card_src->id, card_dst->id).size; - network_link_L07_t *route = ROUTE(card_src->id, card_dst->id).links; + link_L07_t *route = ROUTE(card_src->id, card_dst->id).links; double lat = 0.0; if (action->communication_amount[i * workstation_nb + j] > 0) { @@ -130,7 +130,7 @@ static void *name_service(const char *name) static const char *get_resource_name(void *resource_id) { /* We can freely cast as a cpu_L07_t because it has the same - prefix as network_link_L07_t. However, only cpu_L07_t + prefix as link_L07_t. However, only cpu_L07_t will theoretically be given as an argument here. */ return ((cpu_L07_t) resource_id)->name; @@ -228,10 +228,10 @@ 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_L07_t because it has + /* We can freely cast as a link_L07_t because it has the same prefix as cpu_L07_t */ return lmm_constraint_used(ptask_maxmin_system, - ((network_link_L07_t) resource_id)-> + ((link_L07_t) resource_id)-> constraint); } @@ -321,11 +321,11 @@ static void update_actions_state(double now, double delta) i++))) { constraint_id = lmm_constraint_id(cnst); -/* if(((network_link_L07_t)constraint_id)->type== */ +/* if(((link_L07_t)constraint_id)->type== */ /* SURF_WORKSTATION_RESOURCE_LINK) { */ /* DEBUG2("Checking for link %s (%p)", */ -/* ((network_link_L07_t)constraint_id)->name, */ -/* ((network_link_L07_t)constraint_id)); */ +/* ((link_L07_t)constraint_id)->name, */ +/* ((link_L07_t)constraint_id)); */ /* } */ /* if(((cpu_L07_t)constraint_id)->type== */ /* SURF_WORKSTATION_RESOURCE_CPU) { */ @@ -335,10 +335,10 @@ static void update_actions_state(double now, double delta) /* ((cpu_L07_t)constraint_id)->state_current==SURF_CPU_OFF?"Off":"On"); */ /* } */ - if (((((network_link_L07_t) constraint_id)->type == + if (((((link_L07_t) constraint_id)->type == SURF_WORKSTATION_RESOURCE_LINK) && - (((network_link_L07_t) constraint_id)->state_current == - SURF_NETWORK_LINK_OFF)) || + (((link_L07_t) constraint_id)->state_current == + SURF_LINK_OFF)) || ((((cpu_L07_t) constraint_id)->type == SURF_WORKSTATION_RESOURCE_CPU) && (((cpu_L07_t) constraint_id)->state_current == @@ -360,7 +360,7 @@ static void update_resource_state(void *id, double value) { cpu_L07_t cpu = id; - network_link_L07_t nw_link = id; + link_L07_t nw_link = id; if (nw_link->type == SURF_WORKSTATION_RESOURCE_LINK) { DEBUG2("Updating link %s (%p)", nw_link->name, nw_link); @@ -383,9 +383,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(); @@ -417,10 +417,10 @@ static void finalize(void) { int i, j; - xbt_dict_free(&network_link_set); + xbt_dict_free(&link_set); xbt_dict_free(&workstation_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); @@ -488,12 +488,12 @@ static surf_action_t execute_parallel_task(int workstation_nb, int nb_host = 0; double latency = 0.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); } - xbt_dict_reset(parallel_task_network_link_set); + xbt_dict_reset(parallel_task_link_set); /* Compute the number of affected resources... */ for (i = 0; i < workstation_nb; i++) { @@ -501,21 +501,21 @@ static surf_action_t execute_parallel_task(int workstation_nb, cpu_L07_t card_src = workstation_list[i]; cpu_L07_t card_dst = workstation_list[j]; int route_size = ROUTE(card_src->id, card_dst->id).size; - network_link_L07_t *route = ROUTE(card_src->id, card_dst->id).links; + link_L07_t *route = ROUTE(card_src->id, card_dst->id).links; double lat = 0.0; if (communication_amount[i * workstation_nb + j] > 0) for (k = 0; k < route_size; k++) { lat += route[k]->lat_current; - xbt_dict_set(parallel_task_network_link_set, route[k]->name, + xbt_dict_set(parallel_task_link_set, route[k]->name, route[k], NULL); } latency=MAX(latency,lat); } } - 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++) if (computation_amount[i] > 0) @@ -567,7 +567,7 @@ static surf_action_t execute_parallel_task(int workstation_nb, cpu_L07_t card_src = workstation_list[i]; cpu_L07_t card_dst = workstation_list[j]; int route_size = ROUTE(card_src->id, card_dst->id).size; - network_link_L07_t *route = ROUTE(card_src->id, card_dst->id).links; + link_L07_t *route = ROUTE(card_src->id, card_dst->id).links; if (communication_amount[i * workstation_nb + j] == 0.0) continue; @@ -635,7 +635,7 @@ static surf_action_t action_sleep(void *cpu, double duration) return (surf_action_t) action; } -/* returns an array of network_link_L07_t */ +/* returns an array of link_L07_t */ static const void **get_route(void *src, void *dst) { cpu_L07_t card_src = src; @@ -655,23 +655,23 @@ static int get_route_size(void *src, void *dst) static const char *get_link_name(const void *link) { - return ((network_link_L07_t) link)->name; + return ((link_L07_t) link)->name; } static double get_link_bandwidth(const void *link) { - return ((network_link_L07_t) link)->bw_current; + return ((link_L07_t) link)->bw_current; } static double get_link_latency(const void *link) { - return ((network_link_L07_t) link)->lat_current; + return ((link_L07_t) link)->lat_current; } static xbt_dict_t get_link_properties(void *link) { - return ((network_link_L07_t) link)->properties; + return ((link_L07_t) link)->properties; } @@ -754,24 +754,24 @@ static void parse_cpu_init(void) state_initial, state_trace,/*add the properties*/current_property_set); } -static void network_link_free(void *nw_link) +static void link_free(void *nw_link) { - free(((network_link_L07_t) nw_link)->name); + free(((link_L07_t) nw_link)->name); free(nw_link); } -static network_link_L07_t network_link_new(char *name, +static link_L07_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 + e_surf_link_sharing_policy_t policy, xbt_dict_t properties) { - network_link_L07_t nw_link = xbt_new0(s_network_link_L07_t, 1); + link_L07_t nw_link = xbt_new0(s_link_L07_t, 1); nw_link->model = (surf_model_t) surf_workstation_model; @@ -794,25 +794,25 @@ static network_link_L07_t network_link_new(char *name, lmm_constraint_new(ptask_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); nw_link->properties = properties; - xbt_dict_set(network_link_set, name, nw_link, network_link_free); + xbt_dict_set(link_set, name, nw_link, link_free); return nw_link; } -static void parse_network_link_init(void) +static void parse_link_init(void) { 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_link = SURF_NETWORK_LINK_ON; - e_surf_network_link_sharing_policy_t policy_initial_link = 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_link = xbt_strdup(A_surfxml_link_id); @@ -826,39 +826,39 @@ static void parse_network_link_init(void) || (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; + state_initial_link = SURF_LINK_ON; else if (A_surfxml_link_state == A_surfxml_link_state_OFF) - state_initial_link = SURF_NETWORK_LINK_OFF; + state_initial_link = SURF_LINK_OFF; if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED) - policy_initial_link = SURF_NETWORK_LINK_SHARED; + policy_initial_link = SURF_LINK_SHARED; else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE) - policy_initial_link = SURF_NETWORK_LINK_FATPIPE; + policy_initial_link = SURF_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, + link_new(name_link, bw_initial, bw_trace, lat_initial, lat_trace, state_initial_link, state_trace, policy_initial_link, current_property_set); } static void route_new(int src_id, int dst_id, - network_link_L07_t * link_list, int nb_link) + link_L07_t * link_list, int nb_link) { route_L07_t route = &(ROUTE(src_id, dst_id)); route->size = nb_link; route->links = link_list = - xbt_realloc(link_list, sizeof(network_link_L07_t) * nb_link); + xbt_realloc(link_list, sizeof(link_L07_t) * nb_link); } static int nb_link; static int link_list_capacity; -static network_link_L07_t *link_list = NULL; +static link_L07_t *link_list = NULL; static int src_id = -1; static int dst_id = -1; static int is_first =0; @@ -882,7 +882,7 @@ static void parse_route_set_endpoints(void) nb_link = 0; link_list_capacity = 1; - link_list = xbt_new(network_link_L07_t, link_list_capacity); + link_list = xbt_new(link_L07_t, link_list_capacity); } static void parse_route_elem(void) @@ -892,11 +892,11 @@ static void parse_route_elem(void) link_list_capacity *= 2; link_list = xbt_realloc(link_list, - (link_list_capacity) * sizeof(network_link_L07_t)); + (link_list_capacity) * sizeof(link_L07_t)); } TRY { link_list[nb_link++] = - xbt_dict_get(network_link_set, A_surfxml_link_c_ctn_id); + xbt_dict_get(link_set, A_surfxml_link_c_ctn_id); } CATCH(e) { RETHROW1("Link %s not found (dict raised this exception: %s)", @@ -918,7 +918,7 @@ static void parse_file(const char *file) surf_parse_reset_parser(); 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_link_cb_list, &parse_network_link_init); + 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); @@ -932,13 +932,13 @@ static void parse_file(const char *file) 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,NULL); + SURF_LINK_ON, NULL, + SURF_LINK_FATPIPE,NULL); ROUTE(i, i).size = 1; - ROUTE(i, i).links = xbt_new0(network_link_L07_t, 1); + ROUTE(i, i).links = xbt_new0(link_L07_t, 1); ROUTE(i, i).links[0] = loopback; } } @@ -1030,7 +1030,7 @@ static void model_init_internal(void) surf_workstation_model->common_public->get_cpu_properties = get_properties; workstation_set = xbt_dict_new(); - network_link_set = xbt_dict_new(); + link_set = xbt_dict_new(); if (!ptask_maxmin_system) ptask_maxmin_system = lmm_system_new(); -- 2.20.1