X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a3141b2111e49b104c2c6b59fe9e61146a688d38..d8a555ee87a73f15989d8134ed157646e8dba3e9:/src/surf/workstation_ptask_L07.c

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index 774d540c13..2eb7dcb6f1 100644
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -19,17 +19,17 @@ typedef enum {
 /********* cpu object *****************/
 /**************************************/
 typedef struct cpu_L07 {
-  surf_model_t model;	/* Do not move this field */
-  e_surf_workstation_model_type_t type;	/* Do not move this field */
-  char *name;			/* Do not move this field */
-  lmm_constraint_t constraint;	/* Do not move this field */
+  surf_model_t model;	/* Do not move this field: must match model_obj_t */
+  xbt_dict_t properties;                /* Do not move this field: must match link_L07_t */
+  e_surf_workstation_model_type_t type;	/* Do not move this field: must match link_L07_t */
+  char *name;			        /* Do not move this field: must match link_L07_t */
+  lmm_constraint_t constraint;	        /* Do not move this field: must match link_L07_t */
   double power_scale;
   double power_current;
   tmgr_trace_event_t power_event;
   e_surf_cpu_state_t state_current;
   tmgr_trace_event_t state_event;
   int id;			/* cpu and network card are a single object... */
-  xbt_dict_t properties;
 } s_cpu_L07_t, *cpu_L07_t;
 
 /**************************************/
@@ -37,18 +37,17 @@ typedef struct cpu_L07 {
 /**************************************/
 
 typedef struct link_L07 {
-  surf_model_t model;	/* Do not move this field */
-  e_surf_workstation_model_type_t type;	/* Do not move this field */
-  char *name;			/* Do not move this field */
-  lmm_constraint_t constraint;	/* Do not move this field */
+  surf_model_t model;	/* Do not move this field: must match model_obj_t */
+  xbt_dict_t properties;                /* Do not move this field: must match link_L07_t */
+  e_surf_workstation_model_type_t type;	/* Do not move this field: must match cpu_L07_t */
+  char *name;	  		        /* Do not move this field: must match cpu_L07_t */
+  lmm_constraint_t constraint;	        /* Do not move this field: must match cpu_L07_t */
   double lat_current;
   tmgr_trace_event_t lat_event;
   double bw_current;
   tmgr_trace_event_t bw_event;
   e_surf_link_state_t state_current;
   tmgr_trace_event_t state_event;
-  /*holds the property list that can be associated with the link*/
-  xbt_dict_t properties;
 } s_link_L07_t, *link_L07_t;
 
 
@@ -135,6 +134,10 @@ static const char *get_resource_name(void *resource_id)
 
   return ((cpu_L07_t) resource_id)->name;
 }
+static xbt_dict_t get_properties(void *r) {
+  /* We can freely cast as a cpu_L07_t since it has the same prefix than link_L07_t */
+ return ((cpu_L07_t) r)->properties;
+}
 
 /* action_get_state is inherited from the surf module */
 
@@ -470,12 +473,6 @@ static double get_available_speed(void *cpu)
   return ((cpu_L07_t) cpu)->power_current;
 }
 
-static xbt_dict_t get_properties(void *cpu)
-{
- return ((cpu_L07_t) cpu)->properties;
-}
-
-
 static surf_action_t execute_parallel_task(int workstation_nb,
 					   void **workstation_list,
 					   double *computation_amount,
@@ -669,12 +666,6 @@ static double get_link_latency(const void *link)
 }
 
 
-static xbt_dict_t get_link_properties(void *link)
-{
- return ((link_L07_t) link)->properties;
-}
-
-
 /**************************************/
 /*** Resource Creation & Destruction **/
 /**************************************/
@@ -693,6 +684,8 @@ static cpu_L07_t cpu_new(const char *name, double power_scale,
                          xbt_dict_t cpu_properties)
 {
   cpu_L07_t cpu = xbt_new0(s_cpu_L07_t, 1);
+  xbt_assert1(! xbt_dict_get_or_null(workstation_set, name),
+	      "Host '%s' declared several times in the platform file.",name);
 
   cpu->model = (surf_model_t) surf_workstation_model;
   cpu->type = SURF_WORKSTATION_RESOURCE_CPU;
@@ -751,7 +744,7 @@ static void parse_cpu_init(void)
 
   current_property_set = xbt_dict_new();
   cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace,
-	  state_initial, state_trace,/*add the properties*/current_property_set);
+	  state_initial, state_trace,current_property_set);
 }
 
 static void link_free(void *nw_link)
@@ -761,18 +754,19 @@ static void link_free(void *nw_link)
 }
 
 static link_L07_t link_new(char *name,
-					   double bw_initial,
-					   tmgr_trace_t bw_trace,
-					   double lat_initial,
-					   tmgr_trace_t lat_trace,
-					   e_surf_link_state_t
-					   state_initial,
-					   tmgr_trace_t state_trace,
-					   e_surf_link_sharing_policy_t
-					   policy, xbt_dict_t properties)
-{
+			   double bw_initial,
+			   tmgr_trace_t bw_trace,
+			   double lat_initial,
+			   tmgr_trace_t lat_trace,
+			   e_surf_link_state_t
+			   state_initial,
+			   tmgr_trace_t state_trace,
+			   e_surf_link_sharing_policy_t
+			   policy, xbt_dict_t properties)
+{   
   link_L07_t nw_link = xbt_new0(s_link_L07_t, 1);
-
+  xbt_assert1(! xbt_dict_get_or_null(link_set, name),
+	      "Link '%s' declared several times in the platform file.",name);
 
   nw_link->model = (surf_model_t) surf_workstation_model;
   nw_link->type = SURF_WORKSTATION_RESOURCE_LINK;
@@ -847,29 +841,22 @@ static void parse_link_init(void)
  }
 
 static void route_new(int src_id, int dst_id,
-		      link_L07_t * link_list, int nb_link)
+		      link_L07_t * link_list , int nb_link)
 {
   route_L07_t route = &(ROUTE(src_id, dst_id));
 
   route->size = nb_link;
-  route->links = link_list =
-      xbt_realloc(link_list, sizeof(link_L07_t) * nb_link);
+  route->links = link_list = xbt_realloc(link_list, sizeof(link_L07_t) * nb_link); 
 }
 
-static int nb_link;
-static int link_list_capacity;
-static link_L07_t *link_list = NULL;
+
 static int src_id = -1;
 static int dst_id = -1;
-static int is_first =0;
 
 static void parse_route_set_endpoints(void)
 {
   cpu_L07_t cpu_tmp = NULL;
 
-  if (!is_first) create_routing_table();
-  is_first = 1;	
-
   cpu_tmp = (cpu_L07_t) name_service(A_surfxml_route_src);
   xbt_assert1(cpu_tmp, "Invalid cpu %s", A_surfxml_route_src);
   if (cpu_tmp != NULL)
@@ -880,54 +867,22 @@ static void parse_route_set_endpoints(void)
   if (cpu_tmp != NULL)
     dst_id = cpu_tmp->id;
 
-  nb_link = 0;
-  link_list_capacity = 1;
-  link_list = xbt_new(link_L07_t, link_list_capacity);
-}
-
-static void parse_route_elem(void)
-{
-  xbt_ex_t e;
-  if (nb_link == link_list_capacity) {
-    link_list_capacity *= 2;
-    link_list =
-	xbt_realloc(link_list,
-		    (link_list_capacity) * sizeof(link_L07_t));
-  }
-  TRY {
-    link_list[nb_link++] =
-	xbt_dict_get(link_set, A_surfxml_link_c_ctn_id);
-  }
-  CATCH(e) {
-    RETHROW1("Link %s not found (dict raised this exception: %s)",
-	     A_surfxml_link_c_ctn_id);
-  }
+  route_link_list = xbt_dynar_new(sizeof(char*), &free_string);
 }
 
 static void parse_route_set_route(void)
 {
-  if (src_id != -1 && dst_id != -1)
-    route_new(src_id, dst_id, link_list, nb_link);
+  char* name;
+  if (src_id != -1 && dst_id != -1) {
+     name = bprintf("%d##%d",src_id, dst_id);
+     xbt_dict_set(route_table, name, route_link_list, NULL);
+     free(name);
+  }
 }
 
-static void parse_file(const char *file)
+static void add_loopback(void)
 {
   int i;
-
-  /* Adding callback functions */
-  surf_parse_reset_parser();
-  surfxml_add_callback(STag_surfxml_host_cb_list, &parse_cpu_init);
-  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
-  surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
-  surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
-  surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
-  surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
-
-  /* Parse the file */
-  surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
-  surf_parse_close();
-
   /* Adding loopback if needed */
   for (i = 0; i < nb_workstation; i++)
     if (!ROUTE(i, i).size) {
@@ -943,6 +898,49 @@ static void parse_file(const char *file)
     }
 }
 
+static void add_route()
+{
+    xbt_ex_t e;
+    int nb_link = 0;
+    unsigned int cpt = 0;
+    int link_list_capacity = 0;
+    link_L07_t *link_list = NULL;
+
+    if (routing_table == NULL) create_routing_table();
+
+    src_id = atoi(xbt_dynar_get_as(keys, 0, char*));
+    dst_id = atoi(xbt_dynar_get_as(keys, 1, char*));
+
+    link_list_capacity = xbt_dynar_length(links);
+    link_list = xbt_new(link_L07_t, link_list_capacity);
+
+    char* link = NULL;
+    xbt_dynar_foreach (links, cpt, link) {
+      TRY {
+        link_list[nb_link++] = xbt_dict_get(link_set, link);
+      }
+      CATCH(e) {
+        RETHROW1("Link %s not found (dict raised this exception: %s)", link);
+      }    
+    }
+    route_new(src_id, dst_id, link_list, nb_link);
+}
+
+static void define_callbacks(const char *file)
+{
+  /* Adding callback functions */
+  surf_parse_reset_parser();
+  surfxml_add_callback(STag_surfxml_host_cb_list, &parse_cpu_init);
+  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
+  surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
+  surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
+  surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
+  surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
+  surfxml_add_callback(STag_surfxml_platform_cb_list, &init_route_table);
+  surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route);
+  surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback);
+}
+
 /**************************************/
 /********* Module  creation ***********/
 /**************************************/
@@ -1026,8 +1024,7 @@ static void model_init_internal(void)
   surf_workstation_model->extension_public->get_link_latency =
       get_link_latency;
 
-  surf_workstation_model->common_public->get_link_properties = get_link_properties;
-  surf_workstation_model->common_public->get_cpu_properties = get_properties;
+  surf_workstation_model->common_public->get_properties = get_properties;
 
   workstation_set = xbt_dict_new();
   link_set = xbt_dict_new();
@@ -1045,7 +1042,7 @@ void surf_workstation_model_init_ptask_L07(const char *filename)
   xbt_assert0(!surf_network_model,
 	      "network model type already defined");
   model_init_internal();
-  parse_file(filename);
+  define_callbacks(filename);
 
   update_model_description(surf_workstation_model_description,
 			      surf_workstation_model_description_size,