X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/21b97caf3d5c7cefcf6ec9bcfbb8e866d1b8f465..70388188c97f56fbe2b645c9b00dcb05d0b86509:/src/surf/surfxml_parse.c

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 151593425f..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,34 +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 STag_surfxml_host_cluster(void){
-	surfxml_call_cb_functions(STag_surfxml_host_cb_list);
+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);
-	xbt_free(struct_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);
@@ -339,7 +351,7 @@ void ETag_surfxml_router(void){
 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);
@@ -383,7 +395,7 @@ void ETag_surfxml_cluster(void){
 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);
@@ -407,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);
@@ -432,9 +444,9 @@ void STag_surfxml_link(void){
 		 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){