*/
/* 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 surf_parse_host_cb_list = NULL; // of functions of type: surf_parsing_host_arg_t -> void
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 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);
+
+ surf_parse_host_cb_list = xbt_dynar_new(sizeof(surf_parse_host_fct_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);
ETag_surfxml_router_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)
{
+ xbt_dynar_free(&surf_parse_host_cb_list);
+
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(&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_host(void){
// XBT_INFO("STag_surfxml_host [%s]",A_surfxml_host_id);
- struct_host = xbt_new0(s_hostSG_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_surf_parsing_host_arg_t host;
+ memset(&host,0,sizeof(host));
+
+ host.V_host_id = xbt_strdup(A_surfxml_host_id);
+ host.V_host_power_peak = get_cpu_power(A_surfxml_host_power);
+ surf_parse_get_double(&(host.V_host_power_scale), A_surfxml_host_availability);
+ surf_parse_get_int(&(host.V_host_core),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 = xbt_strdup(A_surfxml_host_coordinates);
- surfxml_call_cb_functions(STag_surfxml_host_cb_list);
+ surf_parse_host(&host);
}
-void STag_surfxml_host_cluster(void){
- surfxml_call_cb_functions(STag_surfxml_host_cb_list);
+void surf_parse_host(surf_parsing_host_arg_t h){
+ unsigned int iterator;
+ surf_parse_host_fct_t fun;
+ xbt_dynar_foreach(surf_parse_host_cb_list, iterator, fun) {
+ if (fun) (*fun) (h);
+ }
+}
+void surf_parse_host_add_cb(surf_parse_host_fct_t fct) {
+ xbt_dynar_push(surf_parse_host_cb_list, &fct);
}
void ETag_surfxml_host(void){
surfxml_call_cb_functions(ETag_surfxml_host_cb_list);
-// xbt_free(struct_host->V_host_id);
}
+
void STag_surfxml_router(void){
- struct_router = xbt_new0(s_router_t, 1);
+ 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);
}
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_cluster_t, 1);
+ 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_sharing_policy = AX_surfxml_cluster_sharing_policy;
struct_cluster->V_cluster_bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy;
+ struct_cluster->V_cluster_availability_file = xbt_strdup(A_surfxml_cluster_availability_file);
+ struct_cluster->V_cluster_state_file = xbt_strdup(A_surfxml_cluster_state_file);
+
surfxml_call_cb_functions(STag_surfxml_cluster_cb_list);
}
void ETag_surfxml_cluster(void){
xbt_free(struct_cluster->V_cluster_prefix);
xbt_free(struct_cluster->V_cluster_suffix);
xbt_free(struct_cluster->V_cluster_radical);
- struct_cluster->S_cluster_power = 0;
- struct_cluster->S_cluster_core = 0;
- struct_cluster->S_cluster_bw = 0;
- struct_cluster->S_cluster_lat = 0;
- struct_cluster->S_cluster_bb_bw = 0;
- struct_cluster->S_cluster_bb_lat = 0;
xbt_free(struct_cluster->S_cluster_router_id);
- struct_cluster->V_cluster_sharing_policy = 0;
- struct_cluster->V_cluster_bb_sharing_policy = 0;
+ 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_peer_t, 1);
+ 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);
struct_peer->V_peer_bw_in = xbt_strdup(A_surfxml_peer_bw_in);
xbt_free(struct_peer);
}
void STag_surfxml_link(void){
- struct_lnk = xbt_new0(s_link_t, 1);
+ 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_bandwidth_file = tmgr_trace_new(A_surfxml_link_bandwidth_file);
struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
}
- surfxml_call_cb_functions(STag_surfxml_link_cb_list);
+ surf_parse_link();
}
-void STag_surfxml_link_cluster(void){
+void surf_parse_link(void){
surfxml_call_cb_functions(STag_surfxml_link_cb_list);
}
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);
}
void STag_surfxml_route(void){
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 */
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
*/
