[ptask] remove some static variables

[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 9ac974c7a53fa3876123247b686a23f6c82d56a4..aeda737b0df86d40950f668488658c81644a0dea 100644 (file)
--- a/src/surf/host_ptask_L07.cpp
+++ b/src/surf/host_ptask_L07.cpp
@@ -16,8 +16,6 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
 
-static int ptask_host_count = 0;
-static xbt_dict_t ptask_parallel_task_link_set = NULL;
 lmm_system_t ptask_maxmin_system = NULL;
 
 
@@ -42,8 +40,7 @@ void surf_host_model_init_ptask_L07(void)
   sg_platf_postparse_add_cb(host_add_traces);
 
   surf_host_model = new simgrid::surf::HostL07Model();
-  simgrid::surf::Model *model = surf_host_model;
-  xbt_dynar_push(all_existing_models, &model);
+  xbt_dynar_push(all_existing_models, &surf_host_model);
 }
 
 
@@ -53,9 +50,9 @@ namespace surf {
 HostL07Model::HostL07Model() : HostModel() {
   if (!ptask_maxmin_system)
        ptask_maxmin_system = lmm_system_new(1);
-  surf_host_model = NULL;
-  surf_network_model = new NetworkL07Model(this);
-  surf_cpu_model_pm = new CpuL07Model(this);
+  p_maxminSystem = ptask_maxmin_system;
+  surf_network_model = new NetworkL07Model(this,ptask_maxmin_system);
+  surf_cpu_model_pm = new CpuL07Model(this,ptask_maxmin_system);
 
   routing_model_create(surf_network_model->createLink("__loopback__",
                                                          498000000, NULL,
@@ -65,18 +62,35 @@ HostL07Model::HostL07Model() : HostModel() {
 }
 
 HostL07Model::~HostL07Model() {
-  xbt_dict_free(&ptask_parallel_task_link_set);
-
   delete surf_cpu_model_pm;
   delete surf_network_model;
-  ptask_host_count = 0;
 
-  if (ptask_maxmin_system) {
-    lmm_system_free(ptask_maxmin_system);
-    ptask_maxmin_system = NULL;
-  }
+  ptask_maxmin_system = NULL; // freed as part of ~Model (it's also stored as p_maxminSystem)
+}
+
+CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys)
+       : CpuModel()
+       , p_hostModel(hmodel)
+       {
+         p_maxminSystem = sys;
+       }
+CpuL07Model::~CpuL07Model() {
+       surf_cpu_model_pm = NULL;
+       p_maxminSystem = NULL; // Avoid multi-free
+}
+NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys)
+       : NetworkModel()
+       , p_hostModel(hmodel)
+       {
+         p_maxminSystem = sys;
+       }
+NetworkL07Model::~NetworkL07Model()
+{
+       surf_network_model = NULL;
+       p_maxminSystem = NULL; // Avoid multi-free
 }
 
+
 double HostL07Model::shareResources(double /*now*/)
 {
   L07Action *action;
@@ -180,18 +194,15 @@ Action *HostL07Model::executeParallelTask(int host_nb,
   L07Action *action = new L07Action(this, 1, 0);
   unsigned int cpt;
   int nb_link = 0;
-  int nb_host = 0;
+  int nb_used_host = 0; /* Only the hosts with something to compute (>0 flops) are counted) */
   double latency = 0.0;
 
+  xbt_dict_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL);
+
   action->p_edgeList->reserve(host_nb);
   for (int i = 0; i<host_nb; i++)
          action->p_edgeList->push_back(sg_host_edge(host_list[i]));
 
-  if (ptask_parallel_task_link_set == NULL)
-    ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL);
-
-  xbt_dict_reset(ptask_parallel_task_link_set);
-
   /* Compute the number of affected resources... */
   for (int i = 0; i < host_nb; i++) {
     for (int j = 0; j < host_nb; j++) {
@@ -216,11 +227,11 @@ Action *HostL07Model::executeParallelTask(int host_nb,
   }
 
   nb_link = xbt_dict_length(ptask_parallel_task_link_set);
-  xbt_dict_reset(ptask_parallel_task_link_set);
+  xbt_dict_free(&ptask_parallel_task_link_set);
 
   for (int i = 0; i < host_nb; i++)
     if (flops_amount[i] > 0)
-      nb_host++;
+      nb_used_host++;
 
   XBT_DEBUG("Creating a parallel task (%p) with %d cpus and %d links.",
          action, host_nb, nb_link);
@@ -262,7 +273,7 @@ Action *HostL07Model::executeParallelTask(int host_nb,
     }
   }
 
-  if (nb_link + nb_host == 0) {
+  if (nb_link + nb_used_host == 0) {
     action->setCost(1.0);
     action->setRemains(0.0);
   }
@@ -289,14 +300,13 @@ Action *NetworkL07Model::communicate(RoutingEdge *src, RoutingEdge *dst,
   return res;
 }
 
-Cpu *CpuL07Model::createCpu(const char *name,  xbt_dynar_t powerPeak,
+Cpu *CpuL07Model::createCpu(simgrid::Host *host,  xbt_dynar_t powerPeakList,
                           int pstate, double power_scale,
                           tmgr_trace_t power_trace, int core,
                           e_surf_resource_state_t state_initial,
                           tmgr_trace_t state_trace)
 {
-  double power_initial = xbt_dynar_get_as(powerPeak, pstate, double);
-  CpuL07 *cpu = new CpuL07(this, name, power_initial, power_scale, power_trace,
+  CpuL07 *cpu = new CpuL07(this, host, powerPeakList, pstate, power_scale, power_trace,
                          core, state_initial, state_trace);
   return cpu;
 }
@@ -387,13 +397,16 @@ void HostL07Model::addTraces()
 /************
  * Resource *
  ************/
-CpuL07::CpuL07(CpuL07Model *model, const char* name,
-                    double speedInitial, double speedScale, tmgr_trace_t speedTrace,
-                          int core, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace)
- : Cpu(model, name, lmm_constraint_new(ptask_maxmin_system, this, speedInitial * speedScale),
-          core, speedInitial, speedScale, state_initial)
+
+CpuL07::CpuL07(CpuL07Model *model, simgrid::Host *host,
+                    xbt_dynar_t speedPeakList, int pstate,
+                                double speedScale, tmgr_trace_t speedTrace,
+                        int core, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace)
+ : Cpu(model, host, speedPeakList, pstate,
+          core, xbt_dynar_get_as(speedPeakList,pstate,double), speedScale, state_initial)
 {
   xbt_assert(m_speedScale > 0, "Power has to be >0");
+  p_constraint = lmm_constraint_new(ptask_maxmin_system, this, xbt_dynar_get_as(speedPeakList,pstate,double) * speedScale);
 
   if (speedTrace)
     p_speedEvent = tmgr_history_add_trace(history, speedTrace, 0.0, 0, this);