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;
}
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());
}
}
-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;
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)) {
}
}
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 {
/************
* Resource *
************/
-
-
-void HostImpl::classInit()
-{
- if (!EXTENSION_ID.valid()) {
- EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::surf::HostImpl>();
- }
-}
-
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)
{
- p_params.ramsize = 0;
+ if (!EXTENSION_ID.valid())
+ EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::surf::HostImpl>();
+ 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 */
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_);
}
}
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);
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);
}
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));
{
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<simgrid::surf::HostImpl>())
xbt_dynar_push(dyn, &ws_vm);
}
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;
}
}}