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

diff --git a/src/surf/network.c b/src/surf/network.c
index 771b7cdd0f..99b301fe6a 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;
@@ -311,7 +311,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 +378,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)
@@ -454,6 +458,12 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate)
   return (surf_action_t) action;
 }
 
+static const void** get_route(void *src, void *dst) {
+  /* TODO */
+
+  return NULL;
+}
+
 static void action_suspend(surf_action_t action)
 {
   ((surf_action_network_CM02_t) action)->suspended = 1;
@@ -464,7 +474,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;
 }
 
@@ -560,6 +571,7 @@ 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;
 
   network_link_set = xbt_dict_new();
   network_card_set = xbt_dict_new();