xbt_die("Parse error on line %d: %s\n", surf_parse_lineno, msg);
}
-void surf_parse_get_double(double *value, const char *string) {
- int ret = sscanf(string, "%lg", value);
+double surf_parse_get_double(const char *string) {
+ double res;
+ int ret = sscanf(string, "%lg", &res);
if (ret != 1)
surf_parse_error(bprintf("%s is not a double", string));
+ return res;
}
-void surf_parse_get_int(int *value, const char *string) {
- int ret = sscanf(string, "%d", value);
+int surf_parse_get_int(const char *string) {
+ int res;
+ int ret = sscanf(string, "%d", &res);
if (ret != 1)
surf_parse_error(bprintf("%s is not an integer", string));
+ return res;
}
*/
/* make sure these symbols are defined as strong ones in this file so that the linker can resolve them */
+//xbt_dynar_t STag_surfxml_host_cb_list = NULL;
xbt_dynar_t STag_surfxml_platform_cb_list = NULL;
xbt_dynar_t ETag_surfxml_platform_cb_list = NULL;
-xbt_dynar_t STag_surfxml_host_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_host_cb_list = NULL;
-xbt_dynar_t STag_surfxml_router_cb_list = NULL;
xbt_dynar_t ETag_surfxml_router_cb_list = NULL;
xbt_dynar_t STag_surfxml_link_cb_list = NULL;
xbt_dynar_t ETag_surfxml_link_cb_list = NULL;
xbt_dynar_t ETag_surfxml_ASroute_cb_list = NULL;
xbt_dynar_t STag_surfxml_bypassRoute_cb_list = NULL;
xbt_dynar_t ETag_surfxml_bypassRoute_cb_list = NULL;
-xbt_dynar_t STag_surfxml_config_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_config_cb_list = NULL;
xbt_dynar_t STag_surfxml_include_cb_list = NULL;
xbt_dynar_t ETag_surfxml_include_cb_list = NULL;
xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_platform_cb_list =
xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_host_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_host_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_router_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
+
+ sg_platf_init();
ETag_surfxml_router_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
STag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_peer_cb_list =
xbt_dynar_new(sizeof(void_f_void_t), NULL);
- STag_surfxml_config_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_config_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
STag_surfxml_include_cb_list =
xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_include_cb_list =
void surf_parse_free_callbacks(void)
{
+ sg_platf_exit();
+
xbt_dynar_free(&STag_surfxml_platform_cb_list);
xbt_dynar_free(&ETag_surfxml_platform_cb_list);
- xbt_dynar_free(&STag_surfxml_host_cb_list);
- xbt_dynar_free(&ETag_surfxml_host_cb_list);
- xbt_dynar_free(&STag_surfxml_router_cb_list);
xbt_dynar_free(&ETag_surfxml_router_cb_list);
xbt_dynar_free(&STag_surfxml_link_cb_list);
xbt_dynar_free(&ETag_surfxml_link_cb_list);
xbt_dynar_free(&ETag_surfxml_cluster_cb_list);
xbt_dynar_free(&STag_surfxml_peer_cb_list);
xbt_dynar_free(&ETag_surfxml_peer_cb_list);
- xbt_dynar_free(&STag_surfxml_config_cb_list);
- xbt_dynar_free(&ETag_surfxml_config_cb_list);
xbt_dynar_free(&STag_surfxml_include_cb_list);
xbt_dynar_free(&ETag_surfxml_include_cb_list);
}
void STag_surfxml_platform(void)
{
- double version;
- surf_parse_get_double(&version, A_surfxml_platform_version);
+ _XBT_GNUC_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version);
xbt_assert((version >= 1.0), "******* BIG FAT WARNING *********\n "
"You're using an ancient XML file.\n"
"available in the tools/ directory of the source archive.");
surfxml_call_cb_functions(STag_surfxml_platform_cb_list);
-
}
void STag_surfxml_host(void){
-// XBT_INFO("STag_surfxml_host [%s]",A_surfxml_host_id);
- struct_host = xbt_new0(s_surf_parsing_host_arg_t, 1);
- struct_host->V_host_id = xbt_strdup(A_surfxml_host_id);
- struct_host->V_host_power_peak = get_cpu_power(A_surfxml_host_power);
- surf_parse_get_double(&(struct_host->V_host_power_scale), A_surfxml_host_availability);
- surf_parse_get_int(&(struct_host->V_host_core),A_surfxml_host_core);
- struct_host->V_host_power_trace = tmgr_trace_new(A_surfxml_host_availability_file);
- struct_host->V_host_state_trace = tmgr_trace_new(A_surfxml_host_state_file);
+ s_sg_platf_host_cbarg_t host;
+ memset(&host,0,sizeof(host));
+
+ xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
+ host.properties = current_property_set = xbt_dict_new();
+
+ host.V_host_id = A_surfxml_host_id;
+ host.V_host_power_peak = get_cpu_power(A_surfxml_host_power);
+ host.V_host_power_scale = surf_parse_get_double( A_surfxml_host_availability);
+ host.V_host_core = surf_parse_get_int(A_surfxml_host_core);
+ host.V_host_power_trace = tmgr_trace_new(A_surfxml_host_availability_file);
+ host.V_host_state_trace = tmgr_trace_new(A_surfxml_host_state_file);
xbt_assert((A_surfxml_host_state == A_surfxml_host_state_ON) ||
(A_surfxml_host_state == A_surfxml_host_state_OFF), "Invalid state");
if (A_surfxml_host_state == A_surfxml_host_state_ON)
- struct_host->V_host_state_initial = SURF_RESOURCE_ON;
+ host.V_host_state_initial = SURF_RESOURCE_ON;
if (A_surfxml_host_state == A_surfxml_host_state_OFF)
- struct_host->V_host_state_initial = SURF_RESOURCE_OFF;
- struct_host->V_host_coord = xbt_strdup(A_surfxml_host_coordinates);
+ host.V_host_state_initial = SURF_RESOURCE_OFF;
+ host.V_host_coord = A_surfxml_host_coordinates;
- surf_parse_host();
-}
-void surf_parse_host(void){
- surfxml_call_cb_functions(STag_surfxml_host_cb_list);
-}
-void ETag_surfxml_host(void){
- surfxml_call_cb_functions(ETag_surfxml_host_cb_list);
- xbt_free(struct_host->V_host_id);
- xbt_free(struct_host);
+ sg_platf_new_host(&host);
+
+ current_property_set = NULL;
}
+void ETag_surfxml_host(void){ /* ignored -- do not add content here */ }
+
void STag_surfxml_router(void){
- struct_router = xbt_new0(s_surf_parsing_router_arg_t, 1);
- struct_router->V_router_id = xbt_strdup(A_surfxml_router_id);
- struct_router->V_router_coord = xbt_strdup(A_surfxml_router_coordinates);
- surfxml_call_cb_functions(STag_surfxml_router_cb_list);
+ s_sg_platf_router_cbarg_t router;
+ memset(&router, 0, sizeof(router));
+
+ router.V_router_id = A_surfxml_router_id;
+ router.V_router_coord = A_surfxml_router_coordinates;
+ sg_platf_new_router(&router);
}
void ETag_surfxml_router(void){
surfxml_call_cb_functions(ETag_surfxml_router_cb_list);
- xbt_free(struct_router->V_router_id);
- xbt_free(struct_router->V_router_coord);
- xbt_free(struct_router);
+
}
void STag_surfxml_cluster(void){
- surf_parse_models_setup(); /* ensure that the models are created after the last <config> tag. See comment in simgrid.dtd */
-
struct_cluster = xbt_new0(s_surf_parsing_cluster_arg_t, 1);
- struct_cluster->V_cluster_id = xbt_strdup(A_surfxml_cluster_id);
- struct_cluster->V_cluster_prefix = xbt_strdup(A_surfxml_cluster_prefix);
- struct_cluster->V_cluster_suffix = xbt_strdup(A_surfxml_cluster_suffix);
- struct_cluster->V_cluster_radical = xbt_strdup(A_surfxml_cluster_radical);
- surf_parse_get_double(&struct_cluster->S_cluster_power,A_surfxml_cluster_power);
- surf_parse_get_int(&struct_cluster->S_cluster_core,A_surfxml_cluster_core);
- surf_parse_get_double(&struct_cluster->S_cluster_bw,A_surfxml_cluster_bw);
- surf_parse_get_double(&struct_cluster->S_cluster_lat,A_surfxml_cluster_lat);
+ struct_cluster->V_cluster_id = A_surfxml_cluster_id;
+ struct_cluster->V_cluster_prefix = A_surfxml_cluster_prefix;
+ struct_cluster->V_cluster_suffix = A_surfxml_cluster_suffix;
+ struct_cluster->V_cluster_radical = A_surfxml_cluster_radical;
+ struct_cluster->S_cluster_power= surf_parse_get_double(A_surfxml_cluster_power);
+ struct_cluster->S_cluster_core = surf_parse_get_int(A_surfxml_cluster_core);
+ struct_cluster->S_cluster_bw = surf_parse_get_double(A_surfxml_cluster_bw);
+ struct_cluster->S_cluster_lat = surf_parse_get_double(A_surfxml_cluster_lat);
if(strcmp(A_surfxml_cluster_bb_bw,""))
- surf_parse_get_double(&struct_cluster->S_cluster_bb_bw,A_surfxml_cluster_bb_bw);
+ struct_cluster->S_cluster_bb_bw = surf_parse_get_double(A_surfxml_cluster_bb_bw);
if(strcmp(A_surfxml_cluster_bb_lat,""))
- surf_parse_get_double(&struct_cluster->S_cluster_bb_lat,A_surfxml_cluster_bb_lat);
+ struct_cluster->S_cluster_bb_lat = surf_parse_get_double(A_surfxml_cluster_bb_lat);
if(!strcmp(A_surfxml_cluster_router_id,""))
struct_cluster->S_cluster_router_id = bprintf("%s%s_router%s",
struct_cluster->V_cluster_prefix,
struct_cluster->V_cluster_id,
struct_cluster->V_cluster_suffix);
else
- struct_cluster->S_cluster_router_id = xbt_strdup(A_surfxml_cluster_router_id);
+ struct_cluster->S_cluster_router_id = A_surfxml_cluster_router_id;
struct_cluster->V_cluster_sharing_policy = AX_surfxml_cluster_sharing_policy;
struct_cluster->V_cluster_bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy;
}
void ETag_surfxml_cluster(void){
surfxml_call_cb_functions(ETag_surfxml_cluster_cb_list);
- xbt_free(struct_cluster->V_cluster_id);
- xbt_free(struct_cluster->V_cluster_prefix);
- xbt_free(struct_cluster->V_cluster_suffix);
- xbt_free(struct_cluster->V_cluster_radical);
- xbt_free(struct_cluster->S_cluster_router_id);
+ if( !strcmp(A_surfxml_cluster_router_id,""))
+ xbt_free(struct_cluster->S_cluster_router_id);
xbt_free(struct_cluster->V_cluster_availability_file);
xbt_free(struct_cluster->V_cluster_state_file);
xbt_free(struct_cluster);
}
void STag_surfxml_peer(void){
- surf_parse_models_setup(); /* ensure that the models are created after the last <config> tag. See comment in simgrid.dtd */
-
struct_peer = xbt_new0(s_surf_parsing_peer_arg_t, 1);
struct_peer->V_peer_id = xbt_strdup(A_surfxml_peer_id);
struct_peer->V_peer_power = xbt_strdup(A_surfxml_peer_power);
}
void STag_surfxml_link(void){
struct_lnk = xbt_new0(s_surf_parsing_link_arg_t, 1);
- struct_lnk->V_link_id = xbt_strdup(A_surfxml_link_id);
- surf_parse_get_double(&(struct_lnk->V_link_bandwidth),A_surfxml_link_bandwidth);
+ struct_lnk->V_link_id = A_surfxml_link_id;
+ struct_lnk->V_link_bandwidth = surf_parse_get_double(A_surfxml_link_bandwidth);
struct_lnk->V_link_bandwidth_file = tmgr_trace_new(A_surfxml_link_bandwidth_file);
- surf_parse_get_double(&(struct_lnk->V_link_latency),A_surfxml_link_latency);
+ struct_lnk->V_link_latency = surf_parse_get_double(A_surfxml_link_latency);
struct_lnk->V_link_latency_file = tmgr_trace_new(A_surfxml_link_latency_file);
xbt_assert((A_surfxml_link_state == A_surfxml_link_state_ON) ||
(A_surfxml_link_state == A_surfxml_link_state_OFF), "Invalid state");
}
void ETag_surfxml_link(void){
surfxml_call_cb_functions(ETag_surfxml_link_cb_list);
- xbt_free(struct_lnk->V_link_id);
xbt_free(struct_lnk);
}
surfxml_call_cb_functions(STag_surfxml_trace_connect_cb_list);
}
void STag_surfxml_AS(void){
- surf_parse_models_setup(); /* ensure that the models are created after the last <config> tag. See comment in simgrid.dtd */
-
surfxml_call_cb_functions(STag_surfxml_AS_cb_list);
}
void STag_surfxml_ASroute(void){
surfxml_call_cb_functions(STag_surfxml_bypassRoute_cb_list);
}
void STag_surfxml_config(void){
- surfxml_call_cb_functions(STag_surfxml_config_cb_list);
+ XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
+ xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
+ current_property_set = xbt_dict_new();
+
+}
+void ETag_surfxml_config(void){
+ xbt_dict_cursor_t cursor = NULL;
+ char *key;
+ char *elem;
+ char *cfg;
+ xbt_dict_foreach(current_property_set, cursor, key, elem) {
+ cfg = bprintf("%s:%s",key,elem);
+ if(xbt_cfg_is_default_value(_surf_cfg_set, key))
+ xbt_cfg_set_parse(_surf_cfg_set, cfg);
+ else
+ XBT_INFO("The custom configuration '%s' is already defined by user!",key);
+ free(cfg);
+ }
+ XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
+ current_property_set = NULL;
}
void STag_surfxml_random(void){
surfxml_call_cb_functions(STag_surfxml_random_cb_list);
parse_method(E, AS);
parse_method(E, ASroute);
parse_method(E, bypassRoute);
-parse_method(E, config);
/* Open and Close parse file */
power_scale = random_generate(random);
}
} else {
- surf_parse_get_double(&power_scale, power);
+ power_scale = surf_parse_get_double(power);
}
return power_scale;
}
static void init_randomness(void)
{
random_id = A_surfxml_random_id;
- surf_parse_get_double(&random_min, A_surfxml_random_min);
- surf_parse_get_double(&random_max, A_surfxml_random_max);
- surf_parse_get_double(&random_mean, A_surfxml_random_mean);
- surf_parse_get_double(&random_std_deviation,
- A_surfxml_random_std_deviation);
+ random_min = surf_parse_get_double(A_surfxml_random_min);
+ random_max = surf_parse_get_double(A_surfxml_random_max);
+ random_mean = surf_parse_get_double(A_surfxml_random_mean);
+ random_std_deviation = surf_parse_get_double(A_surfxml_random_std_deviation);
random_generator = A_surfxml_random_generator;
}
properties);
}
-/**
- *
- *init new routing model component
- */
-
-void surf_AS_new(const char *AS_id, const char *AS_mode)
-{
- routing_AS_init(AS_id, AS_mode);
-}
-
-void surf_AS_finalize(const char *AS_id)
-{
- routing_AS_end(AS_id);
-}
-
/*
* add host to the network element list
*/
