X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b332dfa811db05ccd3c5acbbd7faf48a95c09a34..b8c343250cc9dd9be273331b19567c9744981758:/src/surf/network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index 771b7cdd0f..3acd722bc4 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -8,12 +8,12 @@
 #include "network_private.h"
 #include "xbt/log.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network, surf,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
 				"Logging specific to the SURF network module");
 
 surf_network_resource_t surf_network_resource = NULL;
 
-static xbt_dict_t network_link_set = NULL;
+xbt_dict_t network_link_set = NULL;
 xbt_dict_t network_card_set = NULL;
 
 int card_number = 0;
@@ -143,7 +143,8 @@ static void parse_network_link(void)
 		   policy_initial);
 }
 
-static int nb_link = 0;
+static int nb_link;
+static int link_name_capacity;
 static char **link_name = NULL;
 static int src_id = -1;
 static int dst_id = -1;
@@ -153,14 +154,17 @@ static void parse_route_set_endpoints(void)
   src_id = network_card_new(A_surfxml_route_src);
   dst_id = network_card_new(A_surfxml_route_dst);
   nb_link = 0;
-  link_name = NULL;
+  link_name_capacity = 16;
+  link_name = xbt_new(char*, link_name_capacity);
 }
 
 static void parse_route_elem(void)
 {
-  nb_link++;
-  link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *));
-  link_name[(nb_link) - 1] = xbt_strdup(A_surfxml_route_element_name);
+  if (nb_link == link_name_capacity) {
+    link_name_capacity *= 2;
+    link_name = xbt_realloc(link_name, (link_name_capacity) * sizeof(char *));
+  }
+  link_name[nb_link++] = xbt_strdup(A_surfxml_route_element_name);
 }
 
 static void parse_route_set_route(void)
@@ -311,7 +315,8 @@ static void update_actions_state(double now, double delta)
 	action->latency = 0.0;
       }
       if ((action->latency == 0.0) && !(action->suspended)) 
-	lmm_update_variable_weight(maxmin_system, action->variable, 1.0);
+	lmm_update_variable_weight(maxmin_system, action->variable, 
+				   action->lat_current);
     }
     surf_double_update(&(action->generic_action.remains),
 	lmm_variable_getvalue(action->variable) * deltap);
@@ -377,6 +382,9 @@ static void update_resource_state(void *id,
       else 
 	lmm_update_variable_bound(maxmin_system, action->variable,
 				  min(action->rate,SG_TCP_CTE_GAMMA / (2.0 * action->lat_current)));
+      if(!(action->suspended))
+	lmm_update_variable_weight(maxmin_system, action->variable, 
+				   action->lat_current);
     }
   } else if (event_type == nw_link->state_event) {
     if (value > 0)
@@ -409,7 +417,7 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate)
   action->generic_action.cost = size;
   action->generic_action.remains = size;
   action->generic_action.max_duration = NO_MAX_DURATION;
-  action->generic_action.start = -1.0;
+  action->generic_action.start = surf_get_clock();
   action->generic_action.finish = -1.0;
   action->generic_action.resource_type =
       (surf_resource_t) surf_network_resource;
@@ -454,6 +462,31 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate)
   return (surf_action_t) action;
 }
 
+/* returns an array of network_link_CM02_t */
+static const void** get_route(void *src, void *dst) {
+  network_card_CM02_t card_src = src;
+  network_card_CM02_t card_dst = dst;
+  return (const void**) ROUTE(card_src->id, card_dst->id);
+}
+
+static int get_route_size(void *src, void *dst) {
+  network_card_CM02_t card_src = src;
+  network_card_CM02_t card_dst = dst;
+  return ROUTE_SIZE(card_src->id, card_dst->id);
+}
+
+static const char *get_link_name(const void *link) {
+  return ((network_link_CM02_t) link)->name;
+}
+
+static double get_link_bandwidth(const void *link) {
+  return ((network_link_CM02_t) link)->bw_current;
+}
+
+static double get_link_latency(const void *link) {
+  return ((network_link_CM02_t) link)->lat_current;  
+}
+
 static void action_suspend(surf_action_t action)
 {
   ((surf_action_network_CM02_t) action)->suspended = 1;
@@ -464,7 +497,8 @@ static void action_suspend(surf_action_t action)
 static void action_resume(surf_action_t action)
 {
   lmm_update_variable_weight(maxmin_system,
-			     ((surf_action_network_CM02_t) action)->variable, 1.0);
+			     ((surf_action_network_CM02_t) action)->variable, 
+			     ((surf_action_network_CM02_t) action)->lat_current);
   ((surf_action_network_CM02_t) action)->suspended = 0;
 }
 
@@ -537,6 +571,10 @@ static void surf_network_resource_init_internal(void)
       get_resource_name;
   surf_network_resource->common_public->action_get_state =
       surf_action_get_state;
+  surf_network_resource->common_public->action_get_start_time =
+      surf_action_get_start_time;
+  surf_network_resource->common_public->action_get_finish_time =
+      surf_action_get_finish_time;
   surf_network_resource->common_public->action_free = action_free;
   surf_network_resource->common_public->action_use = action_use;
   surf_network_resource->common_public->action_cancel = action_cancel;
@@ -560,6 +598,11 @@ static void surf_network_resource_init_internal(void)
   surf_cpu_resource->common_public->set_max_duration = action_set_max_duration;
 
   surf_network_resource->extension_public->communicate = communicate;
+  surf_network_resource->extension_public->get_route = get_route;
+  surf_network_resource->extension_public->get_route_size = get_route_size;
+  surf_network_resource->extension_public->get_link_name = get_link_name;
+  surf_network_resource->extension_public->get_link_bandwidth = get_link_bandwidth;
+  surf_network_resource->extension_public->get_link_latency = get_link_latency;
 
   network_link_set = xbt_dict_new();
   network_card_set = xbt_dict_new();