value = xbt_strdup(A_surfxml_prop_value);
xbt_dict_set(current_property_set, A_surfxml_prop_id, value, free);
-
}
void free_string(void *d)
A_surfxml_route_action = action;
SURFXML_BUFFER_SET(route_src, src);
SURFXML_BUFFER_SET(route_dst, dst);
- SURFXML_BUFFER_SET(route_impact_on_src, "0.0");
- SURFXML_BUFFER_SET(route_impact_on_dst, "0.0");
- SURFXML_BUFFER_SET(route_impact_on_src_with_other_recv, "0.0");
- SURFXML_BUFFER_SET(route_impact_on_dst_with_other_send, "0.0");
}
static void parse_change_cpu_data(const char* hostName, const char* surfxml_host_power, const char* surfxml_host_availability,
- const char* surfxml_host_availability_file, const char* surfxml_host_state_file,
- const char* surfxml_host_interference_send, const char* surfxml_host_interference_recv,
- const char* surfxml_host_interference_send_recv, const char* surfxml_host_max_outgoing_rate)
+ const char* surfxml_host_availability_file, const char* surfxml_host_state_file)
{
int AX_ptr = 0;
surfxml_bufferstack = xbt_new0(char, 2048);
SURFXML_BUFFER_SET(host_availability, surfxml_host_availability);
SURFXML_BUFFER_SET(host_availability_file, surfxml_host_availability_file);
SURFXML_BUFFER_SET(host_state_file, surfxml_host_state_file);
- SURFXML_BUFFER_SET(host_interference_send, surfxml_host_interference_send);
- SURFXML_BUFFER_SET(host_interference_recv, surfxml_host_interference_recv);
- SURFXML_BUFFER_SET(host_interference_send_recv, surfxml_host_interference_send_recv);
- SURFXML_BUFFER_SET(host_max_outgoing_rate, surfxml_host_max_outgoing_rate);
}
static void parse_change_link_data(const char* linkName, const char* surfxml_link_bandwidth, const char* surfxml_link_bandwidth_file,
char *id, *suffix, *prefix, *radical;
int start, end;
xbt_dynar_t radical_ends;
+ xbt_dynar_t current_set;
+ char *value;
+ int i;
id = xbt_strdup(A_surfxml_set_id);
prefix = xbt_strdup(A_surfxml_set_prefix);
surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char*));
surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char*));
- xbt_dynar_t current_set = xbt_dynar_new(sizeof(char*), NULL);
+ current_set = xbt_dynar_new(sizeof(char*), NULL);
- char *value;
- int i;
+
for (i=start; i<end; i++) {
value = bprintf("%s%d%s", prefix, i, suffix);
xbt_dynar_push(current_set, &value);
xbt_dict_set(set_list, id, current_set, NULL);
}
+static const char* surfxml_host_power;
+static const char* surfxml_host_availability;
+static const char* surfxml_host_availability_file;
+static const char* surfxml_host_state_file;
+
static void parse_host_foreach(void)
+{
+ surfxml_host_power = A_surfxml_host_power;
+ surfxml_host_availability = A_surfxml_host_availability;
+ surfxml_host_availability_file = A_surfxml_host_availability_file;
+ surfxml_host_state_file = A_surfxml_host_state_file;
+}
+
+static void finalize_host_foreach(void)
{
xbt_dynar_t names = NULL;
unsigned int cpt = 0;
char *name;
+ xbt_dict_cursor_t cursor = NULL;
+ char *key,*data;
+
+ xbt_dict_t cluster_host_props = current_property_set;
xbt_assert1((names = xbt_dict_get_or_null(set_list, foreach_set_name)),
"Set name '%s' reffered by foreach tag not found.", foreach_set_name);
xbt_assert1((strcmp(A_surfxml_host_id, "$1") == 0), "The id of the host within the foreach should point to the foreach set_id (use $1). Your value: %s", A_surfxml_host_id);
- const char* surfxml_host_power = A_surfxml_host_power;
- const char* surfxml_host_availability = A_surfxml_host_availability;
- const char* surfxml_host_availability_file = A_surfxml_host_availability_file;
- const char* surfxml_host_state_file = A_surfxml_host_state_file;
- const char* surfxml_host_interference_send = A_surfxml_host_interference_send;
- const char* surfxml_host_interference_recv = A_surfxml_host_interference_recv;
- const char *surfxml_host_interference_send_recv = A_surfxml_host_interference_send_recv;
- const char* surfxml_host_max_outgoing_rate = A_surfxml_host_max_outgoing_rate;
-
+
/* foreach name in set call the main host callback */
xbt_dynar_foreach (names, cpt, name) {
parse_change_cpu_data(name, surfxml_host_power, surfxml_host_availability,
- surfxml_host_availability_file, surfxml_host_state_file,
- surfxml_host_interference_send, surfxml_host_interference_recv,
- surfxml_host_interference_send_recv, surfxml_host_max_outgoing_rate);
+ surfxml_host_availability_file, surfxml_host_state_file);
surfxml_call_cb_functions(main_STag_surfxml_host_cb_list);
+
+ xbt_dict_foreach(cluster_host_props,cursor,key,data) {
+ xbt_dict_set(current_property_set, xbt_strdup(key), xbt_strdup(data), free);
+ }
+
surfxml_call_cb_functions(main_ETag_surfxml_host_cb_list);
free(surfxml_bufferstack);
}
+ current_property_set = xbt_dict_new();
+
surfxml_bufferstack = old_buff;
}
+static const char* surfxml_link_bandwidth;
+static const char* surfxml_link_bandwidth_file;
+static const char* surfxml_link_latency;
+static const char* surfxml_link_latency_file;
+static const char* surfxml_link_state_file;
+
static void parse_link_foreach(void)
+{
+ surfxml_link_bandwidth = A_surfxml_link_bandwidth;
+ surfxml_link_bandwidth_file = A_surfxml_link_bandwidth_file;
+ surfxml_link_latency = A_surfxml_link_latency;
+ surfxml_link_latency_file = A_surfxml_link_latency_file;
+ surfxml_link_state_file = A_surfxml_link_state_file;
+}
+
+static void finalize_link_foreach(void)
{
xbt_dynar_t names = NULL;
unsigned int cpt = 0;
char *name;
+ xbt_dict_cursor_t cursor = NULL;
+ char *key,*data;
+
+ xbt_dict_t cluster_link_props = current_property_set;
xbt_assert1((names = xbt_dict_get_or_null(set_list, foreach_set_name)),
"Set name '%s' reffered by foreach tag not found.", foreach_set_name);
xbt_assert1((strcmp(A_surfxml_link_id, "$1") == 0), "The id of the link within the foreach should point to the foreach set_id (use $1). Your value: %s", A_surfxml_link_id);
- const char* surfxml_link_bandwidth = A_surfxml_link_bandwidth;
- const char* surfxml_link_bandwidth_file = A_surfxml_link_bandwidth_file;
- const char* surfxml_link_latency = A_surfxml_link_latency;
- const char* surfxml_link_latency_file = A_surfxml_link_latency_file;
- const char* surfxml_link_state_file = A_surfxml_link_state_file;
+
/* for each name in set call the main link callback */
xbt_dynar_foreach (names, cpt, name) {
parse_change_link_data(name, surfxml_link_bandwidth, surfxml_link_bandwidth_file,
surfxml_link_latency, surfxml_link_latency_file, surfxml_link_state_file);
surfxml_call_cb_functions(main_STag_surfxml_link_cb_list);
+
+ xbt_dict_foreach(cluster_link_props,cursor,key,data) {
+ xbt_dict_set(current_property_set, xbt_strdup(key), xbt_strdup(data), free);
+ }
+
surfxml_call_cb_functions(main_ETag_surfxml_link_cb_list);
free(surfxml_bufferstack);
}
+ current_property_set = xbt_dict_new();
+
surfxml_bufferstack = old_buff;
}
ETag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t),NULL);
surfxml_add_callback(STag_surfxml_host_cb_list, &parse_host_foreach);
+ surfxml_add_callback(ETag_surfxml_host_cb_list, &finalize_host_foreach);
surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_foreach);
+ surfxml_add_callback(ETag_surfxml_link_cb_list, &finalize_link_foreach);
/* get set name */
foreach_set_name = xbt_strdup(A_surfxml_foreach_set_id);
xbt_dynar_foreach(src_names, cpt, src_host_name) {
xbt_dynar_foreach(dst_names, cpt2, dst_host_name) {
/* If dst is $* then set this route to have its dst point to all hosts */
- if (strcmp(src_host_name,"$*") != 0 && strcmp(dst_host_name,"$*") == 0){
+ if (strcmp(src_host_name,"$*") != 0 && strcmp(dst_host_name,"$*") == 0){
xbt_dict_foreach(workstation_set, cursor_w, key_w, data_w) {
//int n = xbt_dynar_member(src_names, (char*)key_w);
add_multi_links(src, dst, links, src_host_name, key_w);
char* cluster_bb_lat = A_surfxml_cluster_bb_lat;
char* saved_buff = surfxml_bufferstack;
+
+ char * backbone_name;
+
surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
/* Make set */
SURFXML_START_TAG(foreach);
/* Make host for the foreach */
- parse_change_cpu_data("$1", cluster_power, "1.0", "", "", "1.0", "1.0", "1.0","-1.0");
+ parse_change_cpu_data("$1", cluster_power, "1.0", "", "");
A_surfxml_host_state = A_surfxml_host_state_ON;
SURFXML_START_TAG(host);
SURFXML_END_TAG(foreach);
/* Make backbone link */
- char * backbone_name = bprintf("%s_bb", cluster_id);
+ backbone_name = bprintf("%s_bb", cluster_id);
parse_change_link_data(backbone_name, cluster_bb_bw, "", cluster_bb_lat, "", "");
A_surfxml_link_state = A_surfxml_link_state_ON;
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;
void parse_trace_c_connect(void)
{
+ char* trace_connect;
xbt_assert1(xbt_dict_get_or_null(traces_set_list, A_surfxml_trace_c_connect_trace_id),
"Trace %s undefined", A_surfxml_trace_c_connect_trace_id);
- char* trace_connect = bprintf("%s#%d#%d#%s", A_surfxml_trace_c_connect_trace_id, A_surfxml_trace_c_connect_element,
+ trace_connect = bprintf("%s#%d#%d#%s", A_surfxml_trace_c_connect_trace_id, A_surfxml_trace_c_connect_element,
A_surfxml_trace_c_connect_kind, A_surfxml_trace_c_connect_connector_id);
xbt_dynar_push(traces_connect_list, &trace_connect);
}
