*
* \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;
__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);
}
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;
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;
}
}
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);
|| (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());
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;
/*
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)
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)
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);
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;
}
}
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);
}
} 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;
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); */
}
} 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();
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);
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;
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)
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.
/*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)
"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]
**/
/* 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);
}
/* 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;
}
}
/* 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;
/* 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;
}
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);
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 */
/* 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)) {
/* 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 */
{
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
("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;
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);
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);
*/
/*
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.
/*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 */
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 {
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]
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);
/*********** 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 */
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 {
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;
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 */
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;
}
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)
bus) : 0));
else
return lmm_constraint_used(maxmin_system,
- ((network_link_KCCFLN05_t) resource_id)->
+ ((link_KCCFLN05_t) resource_id)->
constraint);
}
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) { */
/* ((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 ==
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);
}
} 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();
{
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);
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);
}
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++)
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++) {
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;
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;
}
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;
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);
|| (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)
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;
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;
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);
}
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)",
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);
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;
}
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();
}
/*********** 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 */
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;
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;
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) {
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;
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);
}
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) { */
/* ((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 ==
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);
} 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();
{
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);
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++) {
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)
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;
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;
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;
}
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;
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);
|| (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;
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)
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)",
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);
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;
}
}
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();