#include "xbt/misc.h"
#include "xbt/log.h"
+#include "xbt/str.h"
#include "xbt/dict.h"
#include "surf/surfxml_parse_private.h"
#include "surf/surf_private.h"
"Logging specific to the SURF parsing module");
#undef CLEANUP
-#include "surfxml.c"
+#include "simgrid_dtd.c"
/* Initialize the parsing globals */
int route_action = 0;
xbt_dict_t traces_set_list = NULL;
-xbt_dynar_t traces_connect_list = NULL;
+//xbt_dynar_t traces_connect_list = NULL;
+xbt_dict_t trace_connect_list_host_avail = NULL;
+xbt_dict_t trace_connect_list_power = NULL;
+xbt_dict_t trace_connect_list_link_avail = NULL;
+xbt_dict_t trace_connect_list_bandwidth = NULL;
+xbt_dict_t trace_connect_list_latency = NULL;
/* This buffer is used to store the original buffer before substituing it by out own buffer. Usefull for the foreach tag */
char* old_buff;
surfxml_call_cb_functions(ETag_surfxml_platform_cb_list);
+ xbt_dynar_free(&route_link_list);
xbt_dict_free(&random_data_list);
xbt_dict_free(&set_list);
xbt_dict_set(current_property_set, A_surfxml_prop_id, value, free);
}
-void free_string(void *d)
-{
- free(*(void**)d);
-}
-
void surfxml_add_callback(xbt_dynar_t cb_list, void_f_void_t function)
{
xbt_dynar_push(cb_list, &function);
route_multi_table = xbt_dict_new();
route_multi_elements = xbt_dynar_new(sizeof(char*), NULL);
traces_set_list = xbt_dict_new();
- traces_connect_list = xbt_dynar_new(sizeof(char*), NULL);
- random_data_list = xbt_dict_new();
+
+ trace_connect_list_host_avail = xbt_dict_new();
+ trace_connect_list_power = xbt_dict_new();
+ trace_connect_list_link_avail = xbt_dict_new();
+ trace_connect_list_bandwidth = xbt_dict_new();
+ trace_connect_list_latency = xbt_dict_new();
+ random_data_list = xbt_dict_new();
}
void parse_platform_file(const char* file)
current_set = xbt_dynar_new(sizeof(char*), NULL);
- for (i=start; i<end; i++) {
+ for (i=start; i<=end; i++) {
value = bprintf("%s%d%s", prefix, i, suffix);
xbt_dynar_push(current_set, &value);
}
is_symmetric_route = A_surfxml_route_c_multi_symmetric;
route_multi_size++;
- route_link_list = xbt_dynar_new(sizeof(char *), &free_string);
+ route_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
static int contains(xbt_dynar_t list, const char* value)
unsigned int cpt, cpt2, cursor;
char *src_host_name, *dst_host_name, *key, *src, *dst, *val, *key_w, *data_w;
const char* sep="#";
+ xbt_dict_t set;
xbt_dynar_t src_names = NULL, dst_names = NULL, links;
if (!route_multi_elements) return;
- xbt_dict_t set = cpu_set;
+ set = cpu_set;
DEBUG1("%d", xbt_dict_length(workstation_set));
if (workstation_set != NULL && xbt_dict_length(workstation_set) > 0)
set = workstation_set;
dst_names = (xbt_dynar_t)xbt_dict_get_or_null(set_list, dst);
/* Add to dynar even if they are simple names */
if (src_names == NULL) {
- src_names = xbt_dynar_new(sizeof(char *), &free_string);
+ src_names = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
val = xbt_strdup(src);
xbt_dynar_push(src_names, &val);
if (strcmp(val,"$*") != 0 && NULL == xbt_dict_get_or_null(set, val))
THROW3(unknown_error,0,"(In route:multi (%s -> %s) source %s does not exist (not a set or a host)", src, dst, src);
}
if (dst_names == NULL) {
- dst_names = xbt_dynar_new(sizeof(char *), &free_string);
+ dst_names = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
val = xbt_strdup(dst);
if (strcmp(val,"$*") != 0 && NULL == xbt_dict_get_or_null(set, val))
THROW3(unknown_error,0,"(In route:multi (%s -> %s) destination %s does not exist (not a set or a host)", src, dst, dst);
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);
- 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);
+ xbt_assert2(xbt_dict_get_or_null(traces_set_list, A_surfxml_trace_c_connect_trace),
+ "Cannot connect trace %s to %s: trace unknown", A_surfxml_trace_c_connect_trace,A_surfxml_trace_c_connect_element);
+
+ switch (A_surfxml_trace_c_connect_kind) {
+ case A_surfxml_trace_c_connect_kind_HOST_AVAIL:
+ xbt_dict_set(trace_connect_list_host_avail, A_surfxml_trace_c_connect_trace, xbt_strdup(A_surfxml_trace_c_connect_element), free);
+ break;
+ case A_surfxml_trace_c_connect_kind_POWER:
+ xbt_dict_set(trace_connect_list_power, A_surfxml_trace_c_connect_trace, xbt_strdup(A_surfxml_trace_c_connect_element), free);
+ break;
+ case A_surfxml_trace_c_connect_kind_LINK_AVAIL:
+ xbt_dict_set(trace_connect_list_link_avail, A_surfxml_trace_c_connect_trace, xbt_strdup(A_surfxml_trace_c_connect_element), free);
+ break;
+ case A_surfxml_trace_c_connect_kind_BANDWIDTH:
+ xbt_dict_set(trace_connect_list_bandwidth, A_surfxml_trace_c_connect_trace, xbt_strdup(A_surfxml_trace_c_connect_element), free);
+ break;
+ case A_surfxml_trace_c_connect_kind_LATENCY:
+ xbt_dict_set(trace_connect_list_latency, A_surfxml_trace_c_connect_trace, xbt_strdup(A_surfxml_trace_c_connect_element), free);
+ break;
+ default:
+ xbt_die("kind of trace unknown");
+ }
}
/* Random tag functions */
void add_randomness(void)
{
/* If needed aditional properties can be added by using the prop tag */
- random_data_t random = random_new(random_generator, random_min, random_max, random_mean, random_std_deviation);
+ random_data_t random = random_new(random_generator, 0, random_min, random_max, random_mean, random_std_deviation);
xbt_dict_set(random_data_list, random_id, (void *)random, NULL);
}
