X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/26f15ac9dcd0ab193a4072554a1c0487a0f80a69..70388188c97f56fbe2b645c9b00dcb05d0b86509:/src/surf/surfxml_parse.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 8889e75ee6..4db9fccd9a 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -44,9 +44,10 @@ void surf_parse_get_int(int *value, const char *string) { */ /* 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; @@ -158,7 +159,9 @@ void surf_parse_init_callbacks(void) 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); @@ -224,9 +227,10 @@ void surf_parse_reset_callbacks(void) 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); @@ -297,38 +301,42 @@ void STag_surfxml_platform(void) 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 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); - struct_host->V_host_power_peak = 0.0; - struct_host->V_host_core = 0; - struct_host->V_host_power_scale = 0.0; - struct_host->V_host_state_initial = SURF_RESOURCE_ON; - struct_host->V_host_power_trace = NULL; - struct_host->V_host_state_trace = NULL; - xbt_free(struct_host->V_host_coord); - //xbt_free(host); } + 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); @@ -343,17 +351,19 @@ void ETag_surfxml_router(void){ void STag_surfxml_cluster(void){ surf_parse_models_setup(); /* ensure that the models are created after the last 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_radical = xbt_strdup(A_surfxml_cluster_radical); - struct_cluster->S_cluster_power = xbt_strdup(A_surfxml_cluster_power); - struct_cluster->S_cluster_core = xbt_strdup(A_surfxml_cluster_core); - struct_cluster->S_cluster_bw = xbt_strdup(A_surfxml_cluster_bw); - struct_cluster->S_cluster_lat = xbt_strdup(A_surfxml_cluster_lat); - struct_cluster->S_cluster_bb_bw = xbt_strdup(A_surfxml_cluster_bb_bw); - struct_cluster->S_cluster_bb_lat = xbt_strdup(A_surfxml_cluster_bb_lat); + 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); + if(strcmp(A_surfxml_cluster_bb_bw,"")) + surf_parse_get_double(&struct_cluster->S_cluster_bb_bw,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); if(!strcmp(A_surfxml_cluster_router_id,"")) struct_cluster->S_cluster_router_id = bprintf("%s%s_router%s", struct_cluster->V_cluster_prefix, @@ -365,6 +375,9 @@ void STag_surfxml_cluster(void){ 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){ @@ -373,22 +386,16 @@ 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); - xbt_free(struct_cluster->S_cluster_power); - xbt_free(struct_cluster->S_cluster_core); - xbt_free(struct_cluster->S_cluster_bw); - xbt_free(struct_cluster->S_cluster_lat); - xbt_free(struct_cluster->S_cluster_bb_bw); - xbt_free(struct_cluster->S_cluster_bb_lat); 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 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); @@ -412,7 +419,7 @@ void ETag_surfxml_peer(void){ 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); @@ -437,19 +444,14 @@ void STag_surfxml_link(void){ struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX; } - + surf_parse_link(); +} +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); - struct_lnk->V_link_bandwidth = 0; - struct_lnk->V_link_bandwidth_file = NULL; - struct_lnk->V_link_latency = 0; - struct_lnk->V_link_latency_file = NULL; - struct_lnk->V_link_state = SURF_RESOURCE_ON; - struct_lnk->V_link_state_file = NULL; - struct_lnk->V_link_sharing_policy = 0; xbt_free(struct_lnk); }