X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6c619fe932602290423c6a789c2aa034ae9f1cad..b646a2e66bc3ff9183235ab20870815dd89f7ea7:/src/surf/HostImpl.cpp?ds=sidebyside diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 010d3198b7..c425691ce9 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -29,11 +29,12 @@ simgrid::xbt::Extension HostImpl::EXTENSION_ID; /********* * Model * *********/ -HostImpl *HostModel::createHost(const char *name, kernel::routing::NetCard *netElm, Cpu *cpu){ - xbt_dynar_t storageList = (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL); - +HostImpl* HostModel::createHost(const char* name, Cpu* cpu, kernel::routing::NetCard* netcard, xbt_dynar_t storageList) +{ 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_lib_set(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL, (void*)storageList); + + XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->storage_)); return host; } @@ -44,12 +45,9 @@ HostImpl *HostModel::createHost(const char *name, kernel::routing::NetCard *netE void HostModel::adjustWeightOfDummyCpuActions() { /* iterate for all virtual machines */ - for (VMModel::vm_list_t::iterator iter = - VMModel::ws_vms.begin(); - iter != VMModel::ws_vms.end(); ++iter) { + for (VirtualMachine *ws_vm : VirtualMachine::allVms_) { - VirtualMachine *ws_vm = &*iter; - Cpu *cpu = ws_vm->p_cpu; + Cpu *cpu = ws_vm->cpu_; int is_active = lmm_constraint_used(cpu->getModel()->getMaxminSystem(), cpu->getConstraint()); @@ -70,11 +68,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; @@ -83,9 +78,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)) { @@ -99,7 +92,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 { @@ -118,20 +111,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(); - 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 */ @@ -141,28 +134,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_); } } @@ -173,7 +166,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(mnt.storage); @@ -192,7 +185,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(mnt.storage)->getName(); xbt_dict_set(storage_list,mnt.name,storage_name,nullptr); } @@ -227,7 +220,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)); @@ -379,13 +372,8 @@ xbt_dynar_t HostImpl::getVms() { xbt_dynar_t dyn = xbt_dynar_new(sizeof(simgrid::surf::VirtualMachine*), nullptr); - /* iterate for all virtual machines */ - for (simgrid::surf::VMModel::vm_list_t::iterator iter = - simgrid::surf::VMModel::ws_vms.begin(); - iter != simgrid::surf::VMModel::ws_vms.end(); ++iter) { - - simgrid::surf::VirtualMachine *ws_vm = &*iter; - if (this == ws_vm->getPm()->extension(simgrid::surf::HostImpl::EXTENSION_ID)) + for (VirtualMachine *ws_vm : VirtualMachine::allVms_) { + if (this == ws_vm->getPm()->extension()) xbt_dynar_push(dyn, &ws_vm); } @@ -394,13 +382,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; } }}