//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 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 STag_surfxml_route_cb_list = NULL;
xbt_dynar_new(sizeof(void_f_void_t), NULL);
sg_platf_init();
- 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);
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);
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(&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(&STag_surfxml_route_cb_list);
}
/* Stag and Etag parse functions */
+void ETag_surfxml_host(void) { /* ignored -- do not add content here */ }
+void ETag_surfxml_router(void){ /* ignored -- do not add content here */ }
void STag_surfxml_platform(void)
{
}
void STag_surfxml_host(void){
- s_surf_parsing_host_arg_t host;
+ s_sg_platf_host_cbarg_t host;
memset(&host,0,sizeof(host));
- host.V_host_id = xbt_strdup(A_surfxml_host_id);
+ 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_state_initial = SURF_RESOURCE_ON;
if (A_surfxml_host_state == A_surfxml_host_state_OFF)
host.V_host_state_initial = SURF_RESOURCE_OFF;
- host.V_host_coord = xbt_strdup(A_surfxml_host_coordinates);
+ host.V_host_coord = A_surfxml_host_coordinates;
- surf_parse_host(&host);
-}
-void ETag_surfxml_host(void){
- surfxml_call_cb_functions(ETag_surfxml_host_cb_list);
-}
+ sg_platf_new_host(&host);
+ current_property_set = NULL;
+}
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);
-}
-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);
+ 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 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);
}