Each action can now have a maximum duration. That is a convenient way to

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

diff --git a/src/surf/network.c b/src/surf/network.c
index f8eacea..e8d236d 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -295,27 +295,9 @@ static void action_change_state(surf_action_t action,
 
 static xbt_heap_float_t share_resources(xbt_heap_float_t now)
 {
-  surf_action_network_t action = NULL;
-  xbt_swag_t running_actions =
-      surf_network_resource->common_public->states.running_action_set;
-  xbt_maxmin_float_t min = -1;
-  xbt_maxmin_float_t value = -1;
-  lmm_solve(maxmin_system);
-
-  action = xbt_swag_getFirst(running_actions);
-  if (!action)
-    return -1.0;
-  value = lmm_variable_getvalue(action->variable);
-  min = action->generic_action.remains / value;
-
-  xbt_swag_foreach(action, running_actions) {
-    value = action->latency + (action->generic_action.remains /
-       lmm_variable_getvalue(action->variable));
-    if (value < min)
-      min = value;
-  }
-
-  return min;
+  s_surf_action_network_t action;
+  return generic_maxmin_share_resources(surf_network_resource->common_public->states.running_action_set,
+                                       xbt_swag_offset(action,variable));
 }
 
 
@@ -343,11 +325,18 @@ static void update_actions_state(xbt_heap_float_t now,
     }
     action->generic_action.remains -=
       lmm_variable_getvalue(action->variable) * deltap;
+    if(action->generic_action.max_duration!=NO_MAX_DURATION)
+      action->generic_action.max_duration -= delta;
 
 /*     if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
 
     if (action->generic_action.remains <= 0) {
+      action->generic_action.finish = surf_get_clock();
       action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+    } else if((action->generic_action.max_duration!=NO_MAX_DURATION) && 
+             (action->generic_action.max_duration<=0)) {
+      action->generic_action.finish = surf_get_clock();
+      action_change_state((surf_action_t) action, SURF_ACTION_DONE);    
     } else {                   /* Need to check that none of the resource has failed */
       lmm_constraint_t cnst = NULL;
       int i = 0;
@@ -358,6 +347,7 @@ static void update_actions_state(xbt_heap_float_t now,
                                    i++))) {
        nw_link = lmm_constraint_id(cnst);
        if (nw_link->state_current == SURF_NETWORK_LINK_OFF) {
+         action->generic_action.finish = surf_get_clock();
          action_change_state((surf_action_t) action, SURF_ACTION_FAILED);
          break;
        }
@@ -425,6 +415,7 @@ static surf_action_t communicate(void *src, void *dst,
 
   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.finish = -1.0;
   action->generic_action.callback = NULL;