Add FAT_PIPE

[simgrid.git] / src / surf / network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index f9abb9d..60f0dd0 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -17,12 +17,9 @@ surf_network_resource_t surf_network_resource = NULL;
 static xbt_dict_t network_link_set = NULL;
 xbt_dict_t network_card_set = NULL;
 
-static int card_number = 0;
-static network_link_CM02_t **routing_table = NULL;
-static int *routing_table_size = NULL;
-
-#define ROUTE(i,j) routing_table[(i)+(j)*card_number]
-#define ROUTE_SIZE(i,j) routing_table_size[(i)+(j)*card_number]
+int card_number = 0;
+network_link_CM02_t **routing_table = NULL;
+int *routing_table_size = NULL;
 
 static void create_routing_table(void)
 {
@@ -43,7 +40,8 @@ static network_link_CM02_t network_link_new(char *name,
                                       tmgr_trace_t lat_trace,
                                       e_surf_network_link_state_t
                                       state_initial,
-                                      tmgr_trace_t state_trace)
+                                      tmgr_trace_t state_trace,
+                                      e_surf_network_link_sharing_policy_t policy)
 {
   network_link_CM02_t nw_link = xbt_new0(s_network_link_CM02_t, 1);
 
@@ -66,6 +64,9 @@ static network_link_CM02_t network_link_new(char *name,
   nw_link->constraint =
       lmm_constraint_new(maxmin_system, nw_link, nw_link->bw_current);
 
+  if(policy == SURF_NETWORK_LINK_FATPIPE)
+    lmm_constraint_shared(nw_link->constraint);
+
   xbt_dict_set(network_link_set, name, nw_link, network_link_free);
 
   return nw_link;
@@ -114,6 +115,7 @@ static void parse_network_link(void)
   double lat_initial;
   tmgr_trace_t lat_trace;
   e_surf_network_link_state_t state_initial = SURF_NETWORK_LINK_ON;
+  e_surf_network_link_sharing_policy_t policy_initial = SURF_NETWORK_LINK_SHARED;
   tmgr_trace_t state_trace;
 
   name = xbt_strdup(A_network_link_name);
@@ -127,12 +129,19 @@ static void parse_network_link(void)
              "Invalid state")
   if (A_network_link_state==A_network_link_state_ON) 
     state_initial = SURF_NETWORK_LINK_ON;
-  if (A_network_link_state==A_network_link_state_OFF) 
+  else if (A_network_link_state==A_network_link_state_OFF) 
     state_initial = SURF_NETWORK_LINK_OFF;
+
+  if (A_network_link_sharing_policy==A_network_link_sharing_policy_SHARED) 
+    policy_initial = SURF_NETWORK_LINK_SHARED;
+  else if (A_network_link_sharing_policy==A_network_link_sharing_policy_FATPIPE) 
+    policy_initial = SURF_NETWORK_LINK_FATPIPE;
+
   surf_parse_get_trace(&state_trace,A_network_link_state_file);
 
   network_link_new(name, bw_initial, bw_trace,
-                  lat_initial, lat_trace, state_initial, state_trace);
+                  lat_initial, lat_trace, state_initial, state_trace,
+                  policy_initial);
 }
 
 static int nb_link = 0;
@@ -406,20 +415,27 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate)
     action->variable = lmm_variable_new(maxmin_system, action, 1.0, -1.0,
                                        route_size);
 
-  if(action->rate<0)
-    lmm_update_variable_bound(maxmin_system, action->variable,
-                             SG_TCP_CTE_GAMMA / action->lat_current);
-  else 
-    lmm_update_variable_bound(maxmin_system, action->variable,
-                             min(action->rate,SG_TCP_CTE_GAMMA / action->lat_current));
-
-  if(route_size == 0) {
-    action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+  if(action->rate<0) {
+    if(action->lat_current>0)
+      lmm_update_variable_bound(maxmin_system, action->variable,
+                               SG_TCP_CTE_GAMMA / action->lat_current);
+    else
+      lmm_update_variable_bound(maxmin_system, action->variable, -1.0);
+  } else {
+    if(action->lat_current>0)
+      lmm_update_variable_bound(maxmin_system, action->variable,
+                               min(action->rate,SG_TCP_CTE_GAMMA / action->lat_current));
+    else
+      lmm_update_variable_bound(maxmin_system, action->variable, action->rate);
   }
 
   for (i = 0; i < route_size; i++)
     lmm_expand(maxmin_system, route[i]->constraint, action->variable, 1.0);
 
+  if(route_size == 0) {
+    action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+  }
+
   return (surf_action_t) action;
 }
 
@@ -442,6 +458,11 @@ static int action_is_suspended(surf_action_t action)
   return ((surf_action_network_CM02_t) action)->suspended;
 }
 
+static void action_set_max_duration(surf_action_t action, double duration)
+{
+  action->max_duration = duration;
+}
+
 static void finalize(void)
 {
   int i,j;
@@ -520,6 +541,7 @@ static void surf_network_resource_init_internal(void)
   surf_network_resource->common_public->suspend = action_suspend;
   surf_network_resource->common_public->resume = action_resume;
   surf_network_resource->common_public->is_suspended = action_is_suspended;
+  surf_cpu_resource->common_public->set_max_duration = action_set_max_duration;
 
   surf_network_resource->extension_public->communicate = communicate;