XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
"Logging specific to the SURF workstation module (KCCFLN05)");
+XBT_LOG_EXTERNAL_CATEGORY(surf_parse);
typedef enum {
SURF_WORKSTATION_RESOURCE_CPU,
/********* cpu object *****************/
/**************************************/
typedef struct cpu_KCCFLN05 {
- surf_model_t model;
- e_surf_workstation_model_type_t type; /* Do not move this field */
- char *name; /* Do not move this field */
+ surf_model_t model; /* Do not move this field: must match model_obj_t */
+ xbt_dict_t properties; /* Do not move this field: must match link_KCCFLN05_t */
+ e_surf_workstation_model_type_t type; /* Do not move this field: must match link_KCCFLN05_t */
+ char *name; /* Do not move this field: must match link_KCCFLN05_t */
lmm_constraint_t constraint;
lmm_constraint_t bus;
double power_scale;
int id; /* cpu and network card are a single object... */
xbt_dynar_t incomming_communications;
xbt_dynar_t outgoing_communications;
- /*Handles the properties that can be added to cpu's*/
- xbt_dict_t properties;
} s_cpu_KCCFLN05_t, *cpu_KCCFLN05_t;
/**************************************/
/*********** network object ***********/
/**************************************/
-typedef struct network_link_KCCFLN05 {
- surf_model_t model;
- e_surf_workstation_model_type_t type; /* Do not move this field */
- char *name; /* Do not move this field */
+typedef struct link_KCCFLN05 {
+ surf_model_t model; /* Do not move this field: must match model_obj_t */
+ xbt_dict_t properties; /* Do not move this field: must match cpu_KCCFLN05_t */
+ e_surf_workstation_model_type_t type; /* Do not move this field: must match cpu_KCCFLN05_t */
+ char *name; /* Do not move this field: must match cpu_KCCFLN05_t */
lmm_constraint_t constraint;
double lat_current;
tmgr_trace_event_t lat_event;
double bw_current;
tmgr_trace_event_t bw_event;
- e_surf_network_link_state_t state_current;
+ e_surf_link_state_t state_current;
tmgr_trace_event_t state_event;
- /*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;*/
/* convenient function */
static void __update_cpu_usage(cpu_KCCFLN05_t cpu)
{
- int cpt;
+ unsigned int cpt;
surf_action_workstation_KCCFLN05_t action = NULL;
if ((!xbt_dynar_length(cpu->incomming_communications)) &&
(!xbt_dynar_length(cpu->outgoing_communications))) {
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 xbt_dict_t get_properties(void *resource)
+{
+ /* We can freely cast as a cpu_KCCFLN05_t because it has the same
+ prefix as link_KCCFLN05_t. */
+ return ((cpu_KCCFLN05_t) resource)->properties;
+}
+
/* action_get_state is inherited from the surf module */
static void action_use(surf_action_t action)
static int action_free(surf_action_t action)
{
- int cpt;
+ unsigned int cpt;
surf_action_t act = NULL;
cpu_KCCFLN05_t src = ((surf_action_workstation_KCCFLN05_t) action)->src;
cpu_KCCFLN05_t dst = ((surf_action_workstation_KCCFLN05_t) action)->dst;
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);
return ((cpu_KCCFLN05_t) cpu)->power_current;
}
-static xbt_dict_t get_property_list(void *cpu)
-{
- return ((cpu_KCCFLN05_t) cpu)->properties;
-}
-
static surf_action_t communicate(void *src, void *dst, double size,
double rate)
{
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;
-}
-
-
/**************************************/
/*** Resource Creation & Destruction **/
/**************************************/
xbt_dict_t cpu_properties_k)
{
cpu_KCCFLN05_t cpu = xbt_new0(s_cpu_KCCFLN05_t, 1);
+ xbt_assert1(! xbt_dict_get_or_null(workstation_set, name),
+ "Host '%s' declared several times in the platform file.",name);
+ CDEBUG8(surf_parse, "cpu_new(%s,power_scale=%.2f,power_initial=%.2f,state_init=%d,isend=%.2f,irecv=%.2f,isendrev=%.2f) -> %p",
+ name,power_scale,power_initial,state_initial,interference_send,interference_recv,interference_send_recv,cpu);
+
cpu->model = (surf_model_t) surf_workstation_model;
cpu->type = SURF_WORKSTATION_RESOURCE_CPU;
cpu->name = xbt_strdup(name);
surf_parse_get_double(&max_outgoing_rate,
A_surfxml_host_max_outgoing_rate);
current_property_set = xbt_dict_new();
+
cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace,
state_initial, state_trace, interference_send, interference_recv,
- interference_send_recv, max_outgoing_rate,/*add the properties*/current_property_set);
+ interference_send_recv, max_outgoing_rate,current_property_set);
}
-static void network_link_free(void *nw_link)
+static void link_free(void *nw_link)
{
- free(((network_link_KCCFLN05_t) nw_link)->name);
+ free(((link_KCCFLN05_t) nw_link)->name);
free(nw_link);
}
-static network_link_KCCFLN05_t network_link_new(char *name,
- double bw_initial,
- tmgr_trace_t bw_trace,
- double lat_initial,
- tmgr_trace_t lat_trace,
- e_surf_network_link_state_t
- state_initial,
- tmgr_trace_t state_trace,
- e_surf_network_link_sharing_policy_t
- policy, xbt_dict_t network_properties_k)
+static link_KCCFLN05_t link_new(char *name,
+ double bw_initial,
+ tmgr_trace_t bw_trace,
+ double lat_initial,
+ tmgr_trace_t lat_trace,
+ e_surf_link_state_t
+ state_initial,
+ tmgr_trace_t state_trace,
+ e_surf_link_sharing_policy_t
+ policy, xbt_dict_t properties_args)
{
- network_link_KCCFLN05_t nw_link = xbt_new0(s_network_link_KCCFLN05_t, 1);
+ link_KCCFLN05_t nw_link = xbt_new0(s_link_KCCFLN05_t, 1);
nw_link->model = (surf_model_t) surf_workstation_model;
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;
+ nw_link->properties = properties_args;
- 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;
route->impact_on_dst_with_other_send = impact_on_dst_with_other_send;
-
}
-static int nb_link;
-static int link_list_capacity;
-static network_link_KCCFLN05_t *link_list = NULL;
static int src_id = -1;
static int dst_id = -1;
static double impact_on_src;
static double impact_on_dst;
static double impact_on_src_with_other_recv;
static double impact_on_dst_with_other_send;
-static int is_first = 0;
static void parse_route_set_endpoints(void)
{
cpu_KCCFLN05_t cpu_tmp = NULL;
- if (!is_first) create_routing_table();
- is_first = 1;
-
cpu_tmp = (cpu_KCCFLN05_t) name_service(A_surfxml_route_src);
if (cpu_tmp != NULL) {
src_id = cpu_tmp->id;
surf_parse_get_double(&impact_on_dst_with_other_send,
A_surfxml_route_impact_on_dst_with_other_send);
- nb_link = 0;
- link_list_capacity = 1;
- link_list = xbt_new(network_link_KCCFLN05_t, link_list_capacity);
-
+ route_link_list = xbt_dynar_new(sizeof(char *), &free_string);
}
-static void parse_route_elem(void)
+static void parse_route_set_route(void)
{
- xbt_ex_t e;
- if (nb_link == link_list_capacity) {
- link_list_capacity *= 2;
- link_list =
- xbt_realloc(link_list,
- (link_list_capacity) *
- sizeof(network_link_KCCFLN05_t));
- }
- TRY {
- link_list[nb_link++] =
- xbt_dict_get(network_link_set, A_surfxml_link_c_ctn_id);
- }
- CATCH(e) {
- RETHROW1("Link %s not found (dict raised this exception: %s)",
- A_surfxml_link_c_ctn_id);
+ char* name;
+ if (src_id != -1 && dst_id != -1) {
+ name = bprintf("%d##%d##%lf##%lf##%lf##%lf",src_id, dst_id,impact_on_src,
+ impact_on_dst, impact_on_src_with_other_recv,
+ impact_on_dst_with_other_send);
+ xbt_dict_set(route_table, name, route_link_list, NULL);
+ free(name);
}
}
-static void parse_route_set_route(void)
+static void add_loopback()
{
- if (src_id != -1 && dst_id != -1)
- route_new(src_id, dst_id, link_list, nb_link, impact_on_src,
+ int i;
+ /* Adding loopback if needed */
+ for (i = 0; i < nb_workstation; i++) {
+ if (!ROUTE(i, i).size) {
+ if (!loopback)
+ loopback = link_new(xbt_strdup("__MSG_loopback__"),
+ 498000000, NULL, 0.000015, NULL,
+ SURF_LINK_ON, NULL,
+ SURF_LINK_FATPIPE, NULL);
+ ROUTE(i, i).size = 1;
+ ROUTE(i, i).links = xbt_new0(link_KCCFLN05_t, 1);
+ ROUTE(i, i).links[0] = loopback;
+ }
+ }
+}
+
+static void add_route()
+{
+ xbt_ex_t e;
+ int nb_link = 0;
+ int cpt = 0;
+ int link_list_capacity = 0;
+ link_KCCFLN05_t *link_list = NULL;
+
+ if (routing_table == NULL) create_routing_table();
+
+ link_list_capacity = xbt_dynar_length(links);
+ link_list = xbt_new(link_KCCFLN05_t, link_list_capacity);
+
+ src_id = atoi(xbt_dynar_get_as(keys, 0, char*));
+ dst_id = atoi(xbt_dynar_get_as(keys, 1, char*));
+ impact_on_src = atof(xbt_dynar_get_as(keys, 2, char*));
+ impact_on_dst = atof(xbt_dynar_get_as(keys, 3, char*));
+ impact_on_src_with_other_recv = atof(xbt_dynar_get_as(keys, 4, char*));
+ impact_on_dst_with_other_send = atof(xbt_dynar_get_as(keys, 5, char*));
+
+ char* link = NULL;
+ xbt_dynar_foreach (links, cpt, link) {
+ TRY {
+ link_list[nb_link++] = xbt_dict_get(link_set, link);
+ }
+ CATCH(e) {
+ RETHROW1("Link %s not found (dict raised this exception: %s)", link);
+ }
+ }
+ route_new(src_id, dst_id, link_list, nb_link,impact_on_src,
impact_on_dst, impact_on_src_with_other_recv,
impact_on_dst_with_other_send);
}
-
-static void parse_file(const char *file)
+static void define_callbacks(const char *file)
{
- int i;
-
+ CDEBUG0(surf_parse, "Use the KCCFKN05 model");
+
/* Adding callback functions */
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_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);
-
- /* Parse the file */
- surf_parse_open(file);
- xbt_assert1((!surf_parse()), "Parse error in %s", file);
- surf_parse_close();
-
- /* Adding loopback if needed */
- for (i = 0; i < nb_workstation; i++)
- if (!ROUTE(i, i).size) {
- if (!loopback)
- loopback = network_link_new(xbt_strdup("__MSG_loopback__"),
- 498000000, NULL, 0.000015, NULL,
- SURF_NETWORK_LINK_ON, NULL,
- SURF_NETWORK_LINK_FATPIPE, NULL);
- ROUTE(i, i).size = 1;
- ROUTE(i, i).links = xbt_new0(network_link_KCCFLN05_t, 1);
- ROUTE(i, i).links[0] = loopback;
- }
-
+ surfxml_add_callback(STag_surfxml_platform_cb_list, &init_route_table);
+ surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route);
+ surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback);
}
/**************************************/
surf_workstation_model->extension_public->get_available_speed =
get_available_speed;
- surf_workstation_model->common_public->get_cpu_properties = get_property_list;
- surf_workstation_model->common_public->get_link_properties = get_link_property_list;
+ surf_workstation_model->common_public->get_properties = get_properties;
surf_workstation_model->extension_public->communicate = communicate;
surf_workstation_model->extension_public->execute_parallel_task =
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();
}
xbt_assert0(!surf_network_model,
"network model type already defined");
model_init_internal();
- parse_file(filename);
+ define_callbacks(filename);
xbt_dynar_push(model_list, &surf_workstation_model);
}
