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;
/**************************************/
/**************************************/
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 */
+ 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;
tmgr_trace_event_t bw_event;
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_link_KCCFLN05_t, *link_KCCFLN05_t;
//added to work with GTNETS
static xbt_dict_t router_set = NULL;
static lmm_system_t maxmin_system = NULL;
-/*xbt_dict_t 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))) {
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;
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_host = 0;
if (parallel_task_link_set == NULL) {
- parallel_task_link_set =
- xbt_dict_new_ext(workstation_nb * workstation_nb * 10);
+ parallel_task_link_set = xbt_dict_new();
}
/* Compute the number of affected resources... */
return ((link_KCCFLN05_t) link)->lat_current;
}
-static xbt_dict_t get_link_property_list(void *link)
-{
- return ((link_KCCFLN05_t) link)->properties;
-}
-
-
/**************************************/
/*** Resource Creation & Destruction **/
/**************************************/
{
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);
double interference_send_recv = 0.0;
double max_outgoing_rate = -1.0;
- surf_parse_get_double(&power_scale, A_surfxml_host_power);
+ power_scale = get_cpu_power(A_surfxml_host_power);
surf_parse_get_double(&power_initial, A_surfxml_host_availability);
surf_parse_get_trace(&power_trace, A_surfxml_host_availability_file);
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 link_free(void *nw_link)
}
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 network_properties_k)
+ 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)
{
link_KCCFLN05_t nw_link = xbt_new0(s_link_KCCFLN05_t, 1);
lmm_constraint_shared(nw_link->constraint);
/*add the property set*/
- nw_link->properties = network_properties_k;
+ nw_link->properties = properties_args;
xbt_dict_set(link_set, name, nw_link, link_free);
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 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 = 1;
static void parse_route_set_endpoints(void)
{
cpu_KCCFLN05_t cpu_tmp = NULL;
- if (is_first) create_routing_table();
- is_first = 0;
-
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(link_KCCFLN05_t, link_list_capacity);
+
+ route_action = A_surfxml_route_action;
+ 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(link_KCCFLN05_t));
- }
- TRY {
- link_list[nb_link++] =
- xbt_dict_get(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("%x#%x",src_id, dst_id);
+
+ manage_route(route_table, name, route_action, 0);
+ free(name);
}
}
-static void parse_route_set_route(void)
+static void add_loopback(void)
{
- 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(void)
+{
+ xbt_ex_t e;
+ int nb_link = 0;
+ unsigned int cpt = 0;
+ int link_list_capacity = 0;
+ link_KCCFLN05_t *link_list = NULL;
+ xbt_dict_cursor_t cursor = NULL;
+ char *key,*data, *end;
+ const char *sep = "#";
+ xbt_dynar_t links, keys;
+ char* link = NULL;
+
+ if (routing_table == NULL) create_routing_table();
+
+ xbt_dict_foreach(route_table, cursor, key, data) {
+ nb_link = 0;
+ links = (xbt_dynar_t)data;
+ keys = xbt_str_split_str(key, sep);
+
+ link_list_capacity = xbt_dynar_length(links);
+ link_list = xbt_new(link_KCCFLN05_t, link_list_capacity);
+
+ src_id = strtol(xbt_dynar_get_as(keys, 0, char*), &end, 16);
+ dst_id = strtol(xbt_dynar_get_as(keys, 1, char*), &end, 16);
+ /*ATTRIBUTES NOT USED ANYMORE. WILL BE REMOVED FROM MODEL.*/
+ impact_on_src = 0;//atof(xbt_dynar_get_as(keys, 2, char*));
+ impact_on_dst = 0; //atof(xbt_dynar_get_as(keys, 3, char*));
+ impact_on_src_with_other_recv = 0;//atof(xbt_dynar_get_as(keys, 4, char*));
+ impact_on_dst_with_other_send = 0;//atof(xbt_dynar_get_as(keys, 5, char*));
+
+
+ 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);
+ }
-}
+ xbt_dict_free(&route_table);
+}
-static void parse_file(const char *file)
+static void add_traces(void)
{
- int i;
+ xbt_dynar_t trace_connect = NULL;
+ unsigned int cpt;
+ int connect_element, connect_kind;
+ char *value, *trace_id, *connector_id;
+ link_KCCFLN05_t link;
+ cpu_KCCFLN05_t host = NULL;
+ tmgr_trace_t trace;
+
+ if (!traces_connect_list) return;
+
+ /*for all trace connects parse them and update traces for hosts or links */
+ xbt_dynar_foreach (traces_connect_list, cpt, value) {
+ trace_connect = xbt_str_split_str(value, "#");
+ trace_id = xbt_dynar_get_as(trace_connect, 0, char*);
+ connect_element = atoi(xbt_dynar_get_as(trace_connect, 1, char*));
+ connect_kind = atoi(xbt_dynar_get_as(trace_connect, 2, char*));
+ connector_id = xbt_dynar_get_as(trace_connect, 3, char*);
+
+ xbt_assert1((trace = xbt_dict_get_or_null(traces_set_list, trace_id)), "Trace %s undefined", trace_id);
+
+ if (connect_element == A_surfxml_trace_c_connect_element_HOST) {
+ xbt_assert1((host = xbt_dict_get_or_null(workstation_set, connector_id)), "Host %s undefined", connector_id);
+ switch (connect_kind) {
+ case A_surfxml_trace_c_connect_kind_AVAILABILITY: host->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); break;
+ case A_surfxml_trace_c_connect_kind_POWER: host->power_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); break;
+ }
+ }
+ else {
+ xbt_assert1((link = xbt_dict_get_or_null(link_set, connector_id)), "Link %s undefined", connector_id);
+ switch (connect_kind) {
+ case A_surfxml_trace_c_connect_kind_AVAILABILITY: link->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); break;
+ case A_surfxml_trace_c_connect_kind_BANDWIDTH: link->bw_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); break;
+ case A_surfxml_trace_c_connect_kind_LATENCY: link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); break;
+ }
+ }
+ }
+
+ xbt_dynar_free(&trace_connect);
+ xbt_dynar_free(&traces_connect_list);
+ xbt_dict_free(&traces_set_list);
+}
+static void define_callbacks(const char *file)
+{
+ 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_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 = 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;
- }
-
+ surfxml_add_callback(STag_surfxml_platform_cb_list, &init_data);
+ surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route);
+ surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback);
+ surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces);
+ surfxml_add_callback(STag_surfxml_set_cb_list, &parse_sets);
+ surfxml_add_callback(STag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_endpoints);
+ surfxml_add_callback(ETag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_route);
+ surfxml_add_callback(STag_surfxml_foreach_cb_list, &parse_foreach);
+ surfxml_add_callback(STag_surfxml_cluster_cb_list, &parse_cluster);
+ surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_trace_init);
+ surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_trace_finalize);
+ surfxml_add_callback(STag_surfxml_trace_c_connect_cb_list, &parse_trace_c_connect);
+ surfxml_add_callback(STag_surfxml_random_cb_list, &init_randomness);
+ surfxml_add_callback(ETag_surfxml_random_cb_list, &add_randomness);
}
/**************************************/
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 =
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);
}