Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
fix broken file name.
[simgrid.git] / src / surf / workstation_ptask_L07.c
index 4b4d926..13560f1 100644 (file)
@@ -241,11 +241,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) {
@@ -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,