/* 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 ETag_surfxml_host_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 STag_surfxml_route_cb_list = NULL;
void surf_parse_init_callbacks(void)
{
- STag_surfxml_platform_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
- ETag_surfxml_platform_cb_list =
- xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ sg_platf_init(); // FIXME: move to a proper place?
- sg_platf_init();
- ETag_surfxml_host_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);
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);
STag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
void surf_parse_free_callbacks(void)
{
- sg_platf_exit();
+ sg_platf_exit(); // FIXME: better place?
- xbt_dynar_free(&STag_surfxml_platform_cb_list);
- xbt_dynar_free(&ETag_surfxml_platform_cb_list);
- xbt_dynar_free(&ETag_surfxml_host_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(&STag_surfxml_route_cb_list);
}
/* Stag and Etag parse functions */
+void ETag_surfxml_router(void) { /* ignored -- do not add content here */ }
-void STag_surfxml_platform(void)
-{
+void STag_surfxml_platform(void) {
_XBT_GNUC_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version);
xbt_assert((version >= 1.0), "******* BIG FAT WARNING *********\n "
"This program is installed automatically with SimGrid, or "
"available in the tools/ directory of the source archive.");
- surfxml_call_cb_functions(STag_surfxml_platform_cb_list);
+ sg_platf_open();
+}
+void ETag_surfxml_platform(void){
+ sg_platf_close();
}
void STag_surfxml_host(void){
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);
sg_platf_new_host(&host);
}
-void ETag_surfxml_host(void){
- surfxml_call_cb_functions(ETag_surfxml_host_cb_list);
+void ETag_surfxml_host(void) {
+ current_property_set = NULL;
}
-
void STag_surfxml_router(void){
s_sg_platf_router_cbarg_t router;
memset(&router, 0, sizeof(router));
- router.V_router_id = xbt_strdup(A_surfxml_router_id);
- router.V_router_coord = xbt_strdup(A_surfxml_router_coordinates);
+ 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);
-}
void STag_surfxml_cluster(void){
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);
+ 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->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_link(void){
struct_lnk = xbt_new0(s_surf_parsing_link_arg_t, 1);
- struct_lnk->V_link_id = xbt_strdup(A_surfxml_link_id);
+ 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);
struct_lnk->V_link_latency = surf_parse_get_double(A_surfxml_link_latency);
}
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);
}
free(cfg);
}
XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
- current_property_set = NULL;
+ xbt_dict_free(¤t_property_set);
}
void STag_surfxml_random(void){
surfxml_call_cb_functions(STag_surfxml_random_cb_list);
#define parse_method(type,name) \
void type##Tag_surfxml_##name(void) \
{ surfxml_call_cb_functions(type##Tag_surfxml_##name##_cb_list); }
-parse_method(E, platform);
parse_method(E, route);
parse_method(E, link_ctn);
parse_method(E, process);
void parse_properties(const char* prop_id, const char* prop_value)
{
- char *value = NULL;
if (!current_property_set)
current_property_set = xbt_dict_new(); // Maybe, it should raise an error
if(!strcmp(prop_id,"coordinates")){
xbt_die("Setting XML prop coordinates must be \"yes\"");
}
else{
- value = xbt_strdup(prop_value);
- xbt_dict_set(current_property_set, prop_id, value, free);
+ xbt_dict_set(current_property_set, prop_id, xbt_strdup(prop_value), free);
}
}
