Remove one of the many pimple: HostModel::p_cpuModel

Gosh this code is hairly. This one came from the VM war, apparently.

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index 345fd1a..bfe88b0 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -26,7 +26,6 @@ void surf_host_model_init_current_default(void)
   xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "yes");
   surf_cpu_model_init_Cas01();
   surf_network_model_init_LegrandVelho();
   xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "yes");
   surf_cpu_model_init_Cas01();
   surf_network_model_init_LegrandVelho();

-  surf_host_model->p_cpuModel = surf_cpu_model_pm;

 
   Model *model = surf_host_model;
   xbt_dynar_push(model_list, &model);
 
   Model *model = surf_host_model;
   xbt_dynar_push(model_list, &model);


@@ -69,11 +68,9 @@ Host *HostCLM03Model::createHost(const char *name){
 double HostCLM03Model::shareResources(double now){
   adjustWeightOfDummyCpuActions();
 
 double HostCLM03Model::shareResources(double now){
   adjustWeightOfDummyCpuActions();
 

-  double min_by_cpu = p_cpuModel->shareResources(now);
+  double min_by_cpu = surf_cpu_model_pm->shareResources(now);

   double min_by_net = (strcmp(surf_network_model->getName(), "network NS3")) ? surf_network_model->shareResources(now) : -1;
   double min_by_net = (strcmp(surf_network_model->getName(), "network NS3")) ? surf_network_model->shareResources(now) : -1;

-  double min_by_sto = -1;
-  if (p_cpuModel == surf_cpu_model_pm)
-       min_by_sto = surf_storage_model->shareResources(now);
+  double min_by_sto = surf_storage_model->shareResources(now);

 
   XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f",
       this, surf_cpu_model_pm->getName(), min_by_cpu,
 
   XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f",
       this, surf_cpu_model_pm->getName(), min_by_cpu,

diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp
index 99ce613..9433fe7 100644 (file)
--- a/src/surf/host_interface.cpp
+++ b/src/surf/host_interface.cpp
@@ -41,14 +41,10 @@ void host_add_traces(){
  *********/
 HostModel::HostModel(const char *name)
  : Model(name)
  *********/
 HostModel::HostModel(const char *name)
  : Model(name)

-{
-  p_cpuModel = surf_cpu_model_pm;
-}
+{}

 
 HostModel::HostModel()
 
 HostModel::HostModel()

-: Model("Host") {
-  p_cpuModel = surf_cpu_model_pm;
-}
+: Model("Host") {}

 
 HostModel::~HostModel() {
 }
 
 HostModel::~HostModel() {
 }

diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp
index b9958c4..48fa525 100644 (file)
--- a/src/surf/host_interface.hpp
+++ b/src/surf/host_interface.hpp
@@ -80,8 +80,6 @@ public:
                                         double rate)=0;
 
   virtual Action *communicate(Host *src, Host *dst, double size, double rate)=0;
                                         double rate)=0;
 
   virtual Action *communicate(Host *src, Host *dst, double size, double rate)=0;

-
-  CpuModel *p_cpuModel;

 };
 
 /************
 };
 
 /************

diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp
index bf409bd..ec93090 100644 (file)
--- a/src/surf/host_ptask_L07.cpp
+++ b/src/surf/host_ptask_L07.cpp
@@ -57,7 +57,6 @@ HostL07Model::HostL07Model() : HostModel("Host ptask_L07") {
                                                          0.000015, NULL,
                                                          SURF_RESOURCE_ON, NULL,
                                                          SURF_LINK_FATPIPE, NULL));
                                                          0.000015, NULL,
                                                          SURF_RESOURCE_ON, NULL,
                                                          SURF_LINK_FATPIPE, NULL));

-  p_cpuModel = surf_cpu_model_pm;

 }
 
 HostL07Model::~HostL07Model() {
 }
 
 HostL07Model::~HostL07Model() {

diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp
index ff60c24..4afa59e 100644 (file)
--- a/src/surf/vm_hl13.cpp
+++ b/src/surf/vm_hl13.cpp
@@ -23,13 +23,9 @@ void surf_vm_model_init_HL13(void){
  * Model *
  *********/
 
  * Model *
  *********/
 

-VMHL13Model::VMHL13Model() : VMModel() {
-  p_cpuModel = surf_cpu_model_vm;
-}
+VMHL13Model::VMHL13Model() : VMModel() {}

 
 

-void VMHL13Model::updateActionsState(double /*now*/, double /*delta*/){
-  return;
-}
+void VMHL13Model::updateActionsState(double /*now*/, double /*delta*/) {}

 
 Action *VMHL13Model::communicate(Host *src, Host *dst, double size, double rate){
   return surf_network_model->communicate(src->p_netElm, dst->p_netElm, size, rate);
 
 Action *VMHL13Model::communicate(Host *src, Host *dst, double size, double rate){
   return surf_network_model->communicate(src->p_netElm, dst->p_netElm, size, rate);


@@ -130,16 +126,15 @@ double VMHL13Model::shareResources(double now)
   /* 2. Calculate resource share at the virtual machine layer. */
   adjustWeightOfDummyCpuActions();
 
   /* 2. Calculate resource share at the virtual machine layer. */
   adjustWeightOfDummyCpuActions();
 

-  double min_by_cpu = p_cpuModel->shareResources(now);
+  double min_by_cpu = surf_cpu_model_vm->shareResources(now);

   double min_by_net = (strcmp(surf_network_model->getName(), "network NS3")) ? surf_network_model->shareResources(now) : -1;
   double min_by_net = (strcmp(surf_network_model->getName(), "network NS3")) ? surf_network_model->shareResources(now) : -1;

+  // Fixme: take storage into account once it's implemented

   double min_by_sto = -1;
   double min_by_sto = -1;

-  if (p_cpuModel == surf_cpu_model_pm)
-       min_by_sto = surf_storage_model->shareResources(now);

 
   XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f",
 
   XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f",

-      this, surf_cpu_model_pm->getName(), min_by_cpu,
-            surf_network_model->getName(), min_by_net,
-            surf_storage_model->getName(), min_by_sto);
+      this, typeid(surf_cpu_model_pm ).name(), min_by_cpu,
+               typeid(surf_network_model).name(), min_by_net,
+            typeid(surf_storage_model).name(), min_by_sto);

 
   double ret = max(max(min_by_cpu, min_by_net), min_by_sto);
   if (min_by_cpu >= 0.0 && min_by_cpu < ret)
 
   double ret = max(max(min_by_cpu, min_by_net), min_by_sto);
   if (min_by_cpu >= 0.0 && min_by_cpu < ret)

diff --git a/src/surf/vm_interface.cpp b/src/surf/vm_interface.cpp
index d7b0e5c..7d43b69 100644 (file)
--- a/src/surf/vm_interface.cpp
+++ b/src/surf/vm_interface.cpp
@@ -24,9 +24,7 @@ surf_callback(void, VM*) VMStateChangedCallbacks;
  * Model *
  *********/
 
  * Model *
  *********/
 

-VMModel::VMModel() : HostModel("Virtual Machine") {
-  p_cpuModel = surf_cpu_model_vm;
-}
+VMModel::VMModel() : HostModel("Virtual Machine") {}

 
 VMModel::vm_list_t VMModel::ws_vms;
 
 
 VMModel::vm_list_t VMModel::ws_vms;