Cosmetics in HostImpl

diff --git a/include/simgrid/s4u/Host.hpp b/include/simgrid/s4u/Host.hpp
index c5d4e09..c67ead8 100644 (file)
--- a/include/simgrid/s4u/Host.hpp
+++ b/include/simgrid/s4u/Host.hpp
@@ -95,6 +95,8 @@ public:
   int getPstatesCount() const;
   void setPstate(int pstate_index);
   int getPstate();
   int getPstatesCount() const;
   void setPstate(int pstate_index);
   int getPstate();

+  std::vector<const char*> get_attached_storages();
+  // XBT_ATTRIB_DEPRECATED_v323("Please use Host::get_attached_storages() instead.")

   void getAttachedStorages(std::vector<const char*> * storages);
 
   /** Get an associative list [mount point]->[Storage] of all local mount points.
   void getAttachedStorages(std::vector<const char*> * storages);
 
   /** Get an associative list [mount point]->[Storage] of all local mount points.

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index 6eeac3d..15277a4 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -103,7 +103,7 @@ double VMModel::next_occuring_event(double now)
   }
 
   /* 2. Calculate resource share at the virtual machine layer. */
   }
 
   /* 2. Calculate resource share at the virtual machine layer. */

-  ignoreEmptyVmInPmLMM();
+  ignore_empty_vm_in_pm_LMM();

 
   /* 3. Ready. Get the next occurring event */
   return surf_cpu_model_vm->next_occuring_event(now);
 
   /* 3. Ready. Get the next occurring event */
   return surf_cpu_model_vm->next_occuring_event(now);

diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp
index 575103b..362409a 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.hpp
+++ b/src/plugins/vm/VirtualMachineImpl.hpp
@@ -98,7 +98,7 @@ private:
 class XBT_PRIVATE VMModel : public surf::HostModel {
 public:
   VMModel();
 class XBT_PRIVATE VMModel : public surf::HostModel {
 public:
   VMModel();

-  void ignoreEmptyVmInPmLMM() override{};
+  void ignore_empty_vm_in_pm_LMM() override{};

 
   double next_occuring_event(double now) override;
   void update_actions_state(double /*now*/, double /*delta*/) override{};
 
   double next_occuring_event(double now) override;
   void update_actions_state(double /*now*/, double /*delta*/) override{};

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index 38b14b2..61c8305 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -235,11 +235,17 @@ int Host::getPstate()
  * \brief Returns the list of storages attached to an host.
  * \return a vector containing all storages attached to the host
  */
  * \brief Returns the list of storages attached to an host.
  * \return a vector containing all storages attached to the host
  */

+std::vector<const char*> Host::get_attached_storages()
+{
+  return simgrid::simix::kernelImmediate([this] { return this->pimpl_->get_attached_storages(); });
+}
+

 void Host::getAttachedStorages(std::vector<const char*>* storages)
 {
 void Host::getAttachedStorages(std::vector<const char*>* storages)
 {

-  simgrid::simix::kernelImmediate([this, storages] {
-     this->pimpl_->getAttachedStorageList(storages);
-  });
+  std::vector<const char*> local_storages =
+      simgrid::simix::kernelImmediate([this] { return this->pimpl_->get_attached_storages(); });
+  for (auto elm : local_storages)
+    storages->push_back(elm);

 }
 
 std::unordered_map<std::string, Storage*> const& Host::getMountedStorages()
 }
 
 std::unordered_map<std::string, Storage*> const& Host::getMountedStorages()

diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp
index a6c81da..2cf77b6 100644 (file)
--- a/src/simdag/sd_task.cpp
+++ b/src/simdag/sd_task.cpp
@@ -808,7 +808,7 @@ void SD_task_run(SD_task_t task)
   if(task->bytes_amount)
     std::copy_n(task->bytes_amount, host_nb * host_nb, bytes_amount);
 
   if(task->bytes_amount)
     std::copy_n(task->bytes_amount, host_nb * host_nb, bytes_amount);
 

-  task->surf_action = surf_host_model->executeParallelTask(host_nb, hosts, flops_amount, bytes_amount, task->rate);
+  task->surf_action = surf_host_model->execute_parallel(host_nb, hosts, flops_amount, bytes_amount, task->rate);

 
   task->surf_action->set_data(task);
 
 
   task->surf_action->set_data(task);
 

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index b6f81fd..c85a416 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -181,7 +181,7 @@ SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_li
     /* set surf's synchro */
     sg_host_t* host_list_cpy = new sg_host_t[host_nb];
     std::copy_n(host_list, host_nb, host_list_cpy);
     /* set surf's synchro */
     sg_host_t* host_list_cpy = new sg_host_t[host_nb];
     std::copy_n(host_list, host_nb, host_list_cpy);

-    exec->surfAction_ = surf_host_model->executeParallelTask(host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
+    exec->surfAction_ = surf_host_model->execute_parallel(host_nb, host_list_cpy, flops_amount, bytes_amount, rate);

     exec->surfAction_->set_data(exec.get());
     if (timeout > 0) {
       exec->timeoutDetector = host_list[0]->pimpl_cpu->sleep(timeout);
     exec->surfAction_->set_data(exec.get());
     if (timeout > 0) {
       exec->timeoutDetector = host_list[0]->pimpl_cpu->sleep(timeout);

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index 889b934..2005f1c 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -24,7 +24,7 @@ namespace surf {
 /* Each VM has a dummy CPU action on the PM layer. This CPU action works as the constraint (capacity) of the VM in the
  * PM layer. If the VM does not have any active task, the dummy CPU action must be deactivated, so that the VM does not
  * get any CPU share in the PM layer. */
 /* Each VM has a dummy CPU action on the PM layer. This CPU action works as the constraint (capacity) of the VM in the
  * PM layer. If the VM does not have any active task, the dummy CPU action must be deactivated, so that the VM does not
  * get any CPU share in the PM layer. */

-void HostModel::ignoreEmptyVmInPmLMM()
+void HostModel::ignore_empty_vm_in_pm_LMM()

 {
   /* iterate for all virtual machines */
   for (s4u::VirtualMachine* const& ws_vm : vm::VirtualMachineImpl::allVms_) {
 {
   /* iterate for all virtual machines */
   for (s4u::VirtualMachine* const& ws_vm : vm::VirtualMachineImpl::allVms_) {


@@ -51,8 +51,8 @@ static inline double has_cost(double* array, int pos)
     return -1.0;
 }
 
     return -1.0;
 }
 

-kernel::resource::Action* HostModel::executeParallelTask(int host_nb, s4u::Host** host_list, double* flops_amount,
-                                                         double* bytes_amount, double rate)
+kernel::resource::Action* HostModel::execute_parallel(int host_nb, s4u::Host** host_list, double* flops_amount,
+                                                      double* bytes_amount, double rate)

 {
   kernel::resource::Action* action = nullptr;
   if ((host_nb == 1) && (has_cost(bytes_amount, 0) <= 0)) {
 {
   kernel::resource::Action* action = nullptr;
   if ((host_nb == 1) && (has_cost(bytes_amount, 0) <= 0)) {


@@ -101,11 +101,13 @@ HostImpl::HostImpl(s4u::Host* host) : piface_(host)
   piface_->pimpl_ = this;
 }
 
   piface_->pimpl_ = this;
 }
 

-void HostImpl::getAttachedStorageList(std::vector<const char*>* storages)
+std::vector<const char*> HostImpl::get_attached_storages()

 {
 {

+  std::vector<const char*> storages;

   for (auto const& s : storage_)
     if (s.second->getHost() == piface_->getCname())
   for (auto const& s : storage_)
     if (s.second->getHost() == piface_->getCname())

-      storages->push_back(s.second->piface_.getCname());
+      storages.push_back(s.second->piface_.getCname());
+  return storages;

 }
 
 }
 }
 
 }

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index 3325fd3..85db47a 100644 (file)
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.hpp
@@ -35,9 +35,9 @@ class XBT_PRIVATE HostModel : public kernel::resource::Model {
 public:
   HostModel() : Model() {}
 
 public:
   HostModel() : Model() {}
 

-  virtual void ignoreEmptyVmInPmLMM();
-  virtual kernel::resource::Action* executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount,
-                                                        double* bytes_amount, double rate);
+  virtual void ignore_empty_vm_in_pm_LMM();
+  virtual kernel::resource::Action* execute_parallel(int host_nb, sg_host_t* host_list, double* flops_amount,
+                                                     double* bytes_amount, double rate);

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


@@ -54,7 +54,7 @@ public:
   virtual ~HostImpl() = default;
 
   /** @brief Get the vector of storages (by names) attached to the Host */
   virtual ~HostImpl() = default;
 
   /** @brief Get the vector of storages (by names) attached to the Host */

-  virtual void getAttachedStorageList(std::vector<const char*>* storages);
+  virtual std::vector<const char*> get_attached_storages();

 
   std::map<std::string, simgrid::surf::StorageImpl*> storage_;
   simgrid::s4u::Host* piface_ = nullptr;
 
   std::map<std::string, simgrid::surf::StorageImpl*> storage_;
   simgrid::s4u::Host* piface_ = nullptr;

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index 3cbf508..3bf1082 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -47,7 +47,7 @@ namespace surf {
 
 double HostCLM03Model::next_occuring_event(double now)
 {
 
 double HostCLM03Model::next_occuring_event(double now)
 {

-  ignoreEmptyVmInPmLMM();
+  ignore_empty_vm_in_pm_LMM();

 
   double min_by_cpu = surf_cpu_model_pm->next_occuring_event(now);
   double min_by_net =
 
   double min_by_cpu = surf_cpu_model_pm->next_occuring_event(now);
   double min_by_net =

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index 3a88525..2a348a9 100644 (file)
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -134,8 +134,8 @@ void HostL07Model::update_actions_state(double /*now*/, double delta)
   }
 }
 
   }
 }
 

-kernel::resource::Action* HostL07Model::executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount,
-                                                            double* bytes_amount, double rate)
+kernel::resource::Action* HostL07Model::execute_parallel(int host_nb, sg_host_t* host_list, double* flops_amount,
+                                                         double* bytes_amount, double rate)

 {
   return new L07Action(this, host_nb, host_list, flops_amount, bytes_amount, rate);
 }
 {
   return new L07Action(this, host_nb, host_list, flops_amount, bytes_amount, rate);
 }


@@ -221,7 +221,7 @@ kernel::resource::Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host
   host_list[1]    = dst;
   bytes_amount[1] = size;
 
   host_list[1]    = dst;
   bytes_amount[1] = size;
 

-  return hostModel_->executeParallelTask(2, host_list, flops_amount, bytes_amount, rate);
+  return hostModel_->execute_parallel(2, host_list, flops_amount, bytes_amount, rate);

 }
 
 Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host,  std::vector<double> *speedPerPstate, int core)
 }
 
 Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host,  std::vector<double> *speedPerPstate, int core)


@@ -267,7 +267,7 @@ kernel::resource::Action* CpuL07::execution_start(double size)
   host_list[0] = getHost();
   flops_amount[0] = size;
 
   host_list[0] = getHost();
   flops_amount[0] = size;
 

-  return static_cast<CpuL07Model*>(model())->hostModel_->executeParallelTask(1, host_list, flops_amount, nullptr, -1);
+  return static_cast<CpuL07Model*>(model())->hostModel_->execute_parallel(1, host_list, flops_amount, nullptr, -1);

 }
 
 kernel::resource::Action* CpuL07::sleep(double duration)
 }
 
 kernel::resource::Action* CpuL07::sleep(double duration)

diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp
index 70d9556..25364a2 100644 (file)
--- a/src/surf/ptask_L07.hpp
+++ b/src/surf/ptask_L07.hpp
@@ -40,8 +40,8 @@ public:
 
   double next_occuring_event(double now) override;
   void update_actions_state(double now, double delta) override;
 
   double next_occuring_event(double now) override;
   void update_actions_state(double now, double delta) override;

-  kernel::resource::Action* executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount,
-                                                double* bytes_amount, double rate) override;
+  kernel::resource::Action* execute_parallel(int host_nb, sg_host_t* host_list, double* flops_amount,
+                                             double* bytes_amount, double rate) override;

 };
 
 class CpuL07Model : public CpuModel {
 };
 
 class CpuL07Model : public CpuModel {


@@ -104,8 +104,9 @@ public:
 class L07Action : public CpuAction {
   friend Action *CpuL07::execution_start(double size);
   friend Action *CpuL07::sleep(double duration);
 class L07Action : public CpuAction {
   friend Action *CpuL07::execution_start(double size);
   friend Action *CpuL07::sleep(double duration);

-  friend Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t*host_list,
-                                                   double *flops_amount, double *bytes_amount, double rate);
+  friend Action* HostL07Model::execute_parallel(int host_nb, sg_host_t* host_list, double* flops_amount,
+                                                double* bytes_amount, double rate);
+

 public:
   L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* host_list, double* flops_amount,
             double* bytes_amount, double rate);
 public:
   L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* host_list, double* flops_amount,
             double* bytes_amount, double rate);