Make HostL07 behave more like the regular Host

[simgrid.git] / src / surf / host_ptask_L07.cpp

diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp
index f7af590..c092c28 100644 (file)
--- a/src/surf/host_ptask_L07.cpp
+++ b/src/surf/host_ptask_L07.cpp
@@ -486,6 +486,35 @@ LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props,
        lmm_constraint_shared(getConstraint());
 }
 
+Action *CpuL07::execute(double size)
+{
+  sg_host_t*host_list = xbt_new0(sg_host_t, 1);
+  double *flops_amount = xbt_new0(double, 1);
+  double *bytes_amount = xbt_new0(double, 1);
+
+  host_list[0] = sg_host_by_name(getName());
+  flops_amount[0] = size;
+
+  return static_cast<HostL07Model*>(getModel())->executeParallelTask(1, host_list,
+                                             flops_amount,
+                                     bytes_amount, -1);
+}
+
+Action *CpuL07::sleep(double duration)
+{
+  L07Action *action = NULL;
+
+  XBT_IN("(%s,%g)", getName(), duration);
+
+  action = static_cast<L07Action*>(execute(1.0));
+  action->m_maxDuration = duration;
+  action->m_suspended = 2;
+  lmm_update_variable_weight(ptask_maxmin_system, action->getVariable(), 0.0);
+
+  XBT_OUT();
+  return action;
+}
+
 bool CpuL07::isUsed(){
   return lmm_constraint_used(ptask_maxmin_system, getConstraint());
 }
@@ -543,34 +572,6 @@ e_surf_resource_state_t HostL07::getState() {
   return p_cpu->getState();
 }
 
-Action *HostL07::execute(double size)
-{
-  sg_host_t*host_list = xbt_new0(sg_host_t, 1);
-  double *flops_amount = xbt_new0(double, 1);
-  double *bytes_amount = xbt_new0(double, 1);
-
-  host_list[0] = sg_host_by_name(getName());
-  flops_amount[0] = size;
-
-  return static_cast<HostL07Model*>(getModel())->executeParallelTask(1, host_list,
-                                             flops_amount,
-                                     bytes_amount, -1);
-}
-
-Action *HostL07::sleep(double duration)
-{
-  L07Action *action = NULL;
-
-  XBT_IN("(%s,%g)", getName(), duration);
-
-  action = static_cast<L07Action*>(execute(1.0));
-  action->m_maxDuration = duration;
-  action->m_suspended = 2;
-  lmm_update_variable_weight(ptask_maxmin_system, action->getVariable(), 0.0);
-
-  XBT_OUT();
-  return action;
-}
 
 double LinkL07::getBandwidth()
 {