Enforce some order on the tags; needs flexml 1.8 to get relevant error messages when...

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

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index ba2f737..3e88b40 100644 (file)
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -98,8 +98,6 @@ static void update_action_bound(surf_action_workstation_L07_t action)
       if (action->communication_amount[i * workstation_nb + j] > 0) {
        for (k = 0; k < route_size; k++) {
          lat += route[k]->lat_current;
-         xbt_dict_set(parallel_task_network_link_set, route[k]->name,
-                      route[k], NULL);
        }
        lat_current=MAX(lat_current,lat/action->communication_amount[i * workstation_nb + j]);
       }
@@ -194,7 +192,7 @@ static void action_resume(surf_action_t action)
 
   XBT_IN1("(%p)", act);
   if (act->suspended != 2) {
-    lmm_update_variable_weight(ptask_maxmin_system,action->variable, 1.0);
+    lmm_update_variable_weight(ptask_maxmin_system,act->variable, 1.0);
     act->suspended = 0;
   }
   XBT_OUT;
@@ -241,11 +239,11 @@ static double share_resources(double now)
 
   xbt_swag_t running_actions =
       surf_workstation_model->common_public->states.running_action_set;
-  double min = generic_maxmin_share_resources2(running_actions,
-                                              xbt_swag_offset(s_action,
-                                                              variable),
-                                              ptask_maxmin_system,
-                                              bottleneck_solve);
+  double min = generic_maxmin_share_resources(running_actions,
+                                             xbt_swag_offset(s_action,
+                                                             variable),
+                                             ptask_maxmin_system,
+                                             bottleneck_solve);
 
   xbt_swag_foreach(action, running_actions) {
     if (action->latency > 0) {
@@ -485,6 +483,8 @@ static surf_action_t execute_parallel_task(int workstation_nb,
        xbt_dict_new_ext(workstation_nb * workstation_nb * 10);
   }
 
+  xbt_dict_reset(parallel_task_network_link_set);
+
   /* Compute the number of affected resources... */
   for (i = 0; i < workstation_nb; i++) {
     for (j = 0; j < workstation_nb; j++) {
@@ -587,7 +587,7 @@ static surf_action_t execute(void *cpu, double size)
   communication_amount[0] = 0.0;
   computation_amount[0] = size;
 
-  return execute_parallel_task(1, workstation_list, communication_amount, 
+  return execute_parallel_task(1, workstation_list, computation_amount,
                               communication_amount, 1, -1);
 }
 
@@ -1026,7 +1026,6 @@ void surf_workstation_model_init_ptask_L07(const char *filename)
              "network model type already defined");
   model_init_internal();
   parse_file(filename);
-  WARN0("This model does not take latency into account.");
 
   update_model_description(surf_workstation_model_description,
                              surf_workstation_model_description_size,