Removing now useless function.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4650 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 5d162fa..9a85946 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -150,10 +150,10 @@ static void action_change_state(surf_action_t action,
 static double share_resources(double now)
 {
   s_surf_action_cpu_Cas01_t action;
-  return generic_maxmin_share_resources2(surf_cpu_model->common_public->
-                                        states.running_action_set,
-                                        xbt_swag_offset(action, variable),
-                                        cpu_maxmin_system, lmm_solve);
+  return generic_maxmin_share_resources(surf_cpu_model->common_public->
+                                       states.running_action_set,
+                                       xbt_swag_offset(action, variable),
+                                       cpu_maxmin_system, lmm_solve);
 }
 
 static void update_actions_state(double now, double delta)

diff --git a/src/surf/network.c b/src/surf/network.c
index ca825ae..e226081 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -291,11 +291,11 @@ static double share_resources(double now)
       surf_network_model->common_public->states.running_action_set;
   double min;
 
-  min = generic_maxmin_share_resources2(running_actions,
-                                       xbt_swag_offset(s_action,
-                                                       variable),
-                                       network_maxmin_system,
-                                       network_solve);
+  min = generic_maxmin_share_resources(running_actions,
+                                      xbt_swag_offset(s_action,
+                                                      variable),
+                                      network_maxmin_system,
+                                      network_solve);
 
   xbt_swag_foreach(action, running_actions) {
     if (action->latency > 0) {

diff --git a/src/surf/surf.c b/src/surf/surf.c
index aad2569..8880069 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -190,16 +190,9 @@ int find_model_description(s_surf_model_description_t * table,
 }
 
 double generic_maxmin_share_resources(xbt_swag_t running_actions,
-                                     size_t offset)
-{
-  return generic_maxmin_share_resources2(running_actions, offset,
-                                        maxmin_system, lmm_solve);
-}
-
-double generic_maxmin_share_resources2(xbt_swag_t running_actions,
-                                      size_t offset,
-                                      lmm_system_t sys,
-                                      void (*solve) (lmm_system_t))
+                                     size_t offset,
+                                     lmm_system_t sys,
+                                     void (*solve) (lmm_system_t))
 {
   surf_action_t action = NULL;
   double min = -1;

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 809e6ae..e690b1c 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -48,8 +48,6 @@ extern int use_sdp_solver;
 extern int use_lagrange_solver;
 
 double generic_maxmin_share_resources(xbt_swag_t running_actions,
-                                     size_t offset);
-double generic_maxmin_share_resources2(xbt_swag_t running_actions,
                                       size_t offset,
                                       lmm_system_t sys,
                                       void (*solve)(lmm_system_t));

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index fe5d049..67baeed 100644 (file)
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -336,11 +336,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),
-                                              maxmin_system,
-                                              lmm_solve);
+  double min = generic_maxmin_share_resources(running_actions,
+                                             xbt_swag_offset(s_action,
+                                                             variable),
+                                             maxmin_system,
+                                             lmm_solve);
 
   xbt_swag_foreach(action, running_actions) {
     if (action->latency > 0) {

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index 9ab0914..05fdb93 100644 (file)
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -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) {