X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc9460b0958168a1f9adec8208d190bf128ce6cc..ddf6262b78ea331d365560f3c94270a97a6d7763:/src/surf/HostImpl.cpp

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index d4ae879136..1185becf37 100644
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -33,7 +33,7 @@ HostImpl *HostModel::createHost(const char *name, kernel::routing::NetCard *netE
   xbt_dynar_t storageList = (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL);
 
   HostImpl *host = new simgrid::surf::HostImpl(surf_host_model, name, storageList, cpu);
-  XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage));
+  XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->storage_));
   return host;
 }
 
@@ -46,7 +46,7 @@ void HostModel::adjustWeightOfDummyCpuActions()
   /* iterate for all virtual machines */
   for (VirtualMachine *ws_vm : VirtualMachine::allVms_) {
 
-    Cpu *cpu = ws_vm->p_cpu;
+    Cpu *cpu = ws_vm->cpu_;
 
     int is_active = lmm_constraint_used(cpu->getModel()->getMaxminSystem(), cpu->getConstraint());
 
@@ -67,11 +67,8 @@ void HostModel::adjustWeightOfDummyCpuActions()
   }
 }
 
-Action *HostModel::executeParallelTask(int host_nb,
-    sg_host_t *host_list,
-    double *flops_amount,
-    double *bytes_amount,
-    double rate)
+Action* HostModel::executeParallelTask(int host_nb, simgrid::s4u::Host** host_list, double* flops_amount,
+                                       double* bytes_amount, double rate)
 {
 #define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0)
   Action *action =nullptr;
@@ -80,9 +77,7 @@ Action *HostModel::executeParallelTask(int host_nb,
     action = host_list[0]->pimpl_cpu->execution_start(flops_amount[0]);
   } else if ((host_nb == 1)
            && (cost_or_zero(flops_amount, 0) == 0.0)) {
-    action = surf_network_model->communicate(host_list[0]->pimpl_netcard,
-                                         host_list[0]->pimpl_netcard,
-                       bytes_amount[0], rate);
+    action = surf_network_model->communicate(host_list[0], host_list[0], bytes_amount[0], rate);
   } else if ((host_nb == 2)
              && (cost_or_zero(flops_amount, 0) == 0.0)
              && (cost_or_zero(flops_amount, 1) == 0.0)) {
@@ -96,7 +91,7 @@ Action *HostModel::executeParallelTask(int host_nb,
       }
     }
     if (nb == 1) {
-      action = surf_network_model->communicate(host_list[0]->pimpl_netcard, host_list[1]->pimpl_netcard, value, rate);
+      action = surf_network_model->communicate(host_list[0], host_list[1], value, rate);
     } else if (nb == 0) {
        xbt_die("Cannot have a communication with no flop to exchange in this model. You should consider using the ptask model");
     } else {       
@@ -115,20 +110,20 @@ Action *HostModel::executeParallelTask(int host_nb,
 HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, xbt_dynar_t storage, Cpu *cpu)
  : Resource(model, name)
  , PropertyHolder(nullptr)
- , p_storage(storage), p_cpu(cpu)
+ , storage_(storage), cpu_(cpu)
 {
   if (!EXTENSION_ID.valid())
     EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::surf::HostImpl>();
-  p_params.ramsize = 0;
+  params_.ramsize = 0;
 }
 
 HostImpl::HostImpl(simgrid::surf::HostModel *model, const char *name, lmm_constraint_t constraint,
                  xbt_dynar_t storage, Cpu *cpu)
  : Resource(model, name, constraint)
  , PropertyHolder(nullptr)
- , p_storage(storage), p_cpu(cpu)
+ , storage_(storage), cpu_(cpu)
 {
-  p_params.ramsize = 0;
+  params_.ramsize = 0;
 }
 
 /** @brief use destroy() instead of this destructor */
@@ -138,28 +133,28 @@ HostImpl::~HostImpl()
 
 void HostImpl::attach(simgrid::s4u::Host* host)
 {
-  if (piface != nullptr)
+  if (piface_ != nullptr)
     xbt_die("Already attached to host %s", host->name().c_str());
   host->extension_set(this);
-  piface = host;
+  piface_ = host;
 }
 
 bool HostImpl::isOn() const {
-  return p_cpu->isOn();
+  return cpu_->isOn();
 }
 bool HostImpl::isOff() const {
-  return p_cpu->isOff();
+  return cpu_->isOff();
 }
 void HostImpl::turnOn(){
   if (isOff()) {
-    p_cpu->turnOn();
-    simgrid::s4u::Host::onStateChange(*this->piface);
+    cpu_->turnOn();
+    simgrid::s4u::Host::onStateChange(*this->piface_);
   }
 }
 void HostImpl::turnOff(){
   if (isOn()) {
-    p_cpu->turnOff();
-    simgrid::s4u::Host::onStateChange(*this->piface);
+    cpu_->turnOff();
+    simgrid::s4u::Host::onStateChange(*this->piface_);
   }
 }
 
@@ -170,7 +165,7 @@ simgrid::surf::Storage *HostImpl::findStorageOnMountList(const char* mount)
   unsigned int cursor;
 
   XBT_DEBUG("Search for storage name '%s' on '%s'", mount, getName());
-  xbt_dynar_foreach(p_storage,cursor,mnt){
+  xbt_dynar_foreach(storage_,cursor,mnt){
     XBT_DEBUG("See '%s'",mnt.name);
     if(!strcmp(mount,mnt.name)){
       st = static_cast<simgrid::surf::Storage*>(mnt.storage);
@@ -189,7 +184,7 @@ xbt_dict_t HostImpl::getMountedStorageList()
   xbt_dict_t storage_list = xbt_dict_new_homogeneous(nullptr);
   char *storage_name = nullptr;
 
-  xbt_dynar_foreach(p_storage,i,mnt){
+  xbt_dynar_foreach(storage_,i,mnt){
     storage_name = (char *)static_cast<simgrid::surf::Storage*>(mnt.storage)->getName();
     xbt_dict_set(storage_list,mnt.name,storage_name,nullptr);
   }
@@ -224,7 +219,7 @@ Action *HostImpl::open(const char* fullpath) {
   char *mount_name = nullptr;
 
   XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, getName());
-  xbt_dynar_foreach(p_storage,cursor,mnt)
+  xbt_dynar_foreach(storage_,cursor,mnt)
   {
     XBT_DEBUG("See '%s'",mnt.name);
     file_mount_name = (char *) xbt_malloc ((strlen(mnt.name)+1));
@@ -386,13 +381,13 @@ xbt_dynar_t HostImpl::getVms()
 
 void HostImpl::getParams(vm_params_t params)
 {
-  *params = p_params;
+  *params = params_;
 }
 
 void HostImpl::setParams(vm_params_t params)
 {
   /* may check something here. */
-  p_params = *params;
+  params_ = *params;
 }
 
 }}