#include "src/surf/HostImpl.hpp"
#include "simgrid/sg_config.h"
+#include "VirtualMachineImpl.hpp"
#include "network_interface.hpp"
-#include "virtual_machine.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module");
namespace simgrid {
namespace surf {
-simgrid::xbt::Extension<simgrid::s4u::Host, HostImpl> 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 *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));
- return host;
-}
/* 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
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 (VirtualMachineImpl* ws_vm : VirtualMachineImpl::allVms_) {
- VirtualMachine *ws_vm = &*iter;
- Cpu *cpu = ws_vm->p_cpu;
+ Cpu* cpu = ws_vm->piface_->pimpl_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)
+HostImpl::HostImpl(s4u::Host* host, xbt_dynar_t storage) : PropertyHolder(nullptr), storage_(storage), piface_(host)
{
- p_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)
-{
- p_params.ramsize = 0;
+ piface_->pimpl_ = this;
+ params_.ramsize = 0;
}
/** @brief use destroy() instead of this destructor */
-HostImpl::~HostImpl()
-{
-}
-
-void HostImpl::attach(simgrid::s4u::Host* host)
-{
- if (piface != nullptr)
- xbt_die("Already attached to host %s", host->name().c_str());
- host->extension_set(this);
- piface = host;
-}
-
-bool HostImpl::isOn() const {
- return p_cpu->isOn();
-}
-bool HostImpl::isOff() const {
- return p_cpu->isOff();
-}
-void HostImpl::turnOn(){
- if (isOff()) {
- p_cpu->turnOn();
- simgrid::s4u::Host::onStateChange(*this->piface);
- }
-}
-void HostImpl::turnOff(){
- if (isOn()) {
- p_cpu->turnOff();
- simgrid::s4u::Host::onStateChange(*this->piface);
- }
-}
+HostImpl::~HostImpl() = default;
simgrid::surf::Storage *HostImpl::findStorageOnMountList(const char* mount)
{
s_mount_t mnt;
unsigned int cursor;
- XBT_DEBUG("Search for storage name '%s' on '%s'", mount, getName());
- xbt_dynar_foreach(p_storage,cursor,mnt){
+ XBT_DEBUG("Search for storage name '%s' on '%s'", mount, piface_->name().c_str());
+ 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);
}
}
if(!st)
- xbt_die("Can't find mount '%s' for '%s'", mount, getName());
+ xbt_die("Can't find mount '%s' for '%s'", mount, piface_->name().c_str());
return st;
}
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);
}
void **data;
xbt_dynar_t result = xbt_dynar_new(sizeof(void*), nullptr);
xbt_lib_foreach(storage_lib, cursor, key, data) {
- if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) {
- simgrid::surf::Storage *storage = static_cast<simgrid::surf::Storage*>(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL));
- if(!strcmp((const char*)storage->p_attach,this->getName())){
- xbt_dynar_push_as(result, void *, (void*)storage->getName());
- }
+ if (xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) {
+ simgrid::surf::Storage* storage = static_cast<simgrid::surf::Storage*>(
+ xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL));
+ if (!strcmp((const char*)storage->attach_, piface_->name().c_str())) {
+ xbt_dynar_push_as(result, void*, (void*)storage->getName());
+ }
}
}
return result;
char *file_mount_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_DEBUG("Search for storage name for '%s' on '%s'", fullpath, piface_->name().c_str());
+ xbt_dynar_foreach(storage_,cursor,mnt)
{
XBT_DEBUG("See '%s'",mnt.name);
file_mount_name = (char *) xbt_malloc ((strlen(mnt.name)+1));
mount_name[longest_prefix_length] = '\0';
}
else
- xbt_die("Can't find mount point for '%s' on '%s'", fullpath, getName());
+ xbt_die("Can't find mount point for '%s' on '%s'", fullpath, piface_->name().c_str());
XBT_DEBUG("OPEN %s on disk '%s'",path, st->getName());
Action *action = st->open((const char*)mount_name, (const char*)path);
simgrid::surf::Storage *st = findStorageOnMountList(fd->mount);
/* Check if the file is on this storage */
- if (!xbt_dict_get_or_null(st->p_content, fd->name)){
+ if (!xbt_dict_get_or_null(st->content_, fd->name)){
XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->name,
st->getName());
return -1;
} else {
XBT_DEBUG("UNLINK %s on disk '%s'",fd->name, st->getName());
- st->m_usedSize -= fd->size;
+ st->usedSize_ -= fd->size;
// Remove the file from storage
- xbt_dict_remove(st->p_content, fd->name);
+ xbt_dict_remove(st->content_, fd->name);
xbt_free(fd->name);
xbt_free(fd->mount);
xbt_dynar_push_as(info, sg_size_t *, psize);
xbt_dynar_push_as(info, void *, fd->mount);
xbt_dynar_push_as(info, void *, (void *)st->getName());
- xbt_dynar_push_as(info, void *, st->p_typeId);
- xbt_dynar_push_as(info, void *, st->p_contentType);
+ xbt_dynar_push_as(info, void *, st->typeId_);
+ xbt_dynar_push_as(info, void *, st->contentType_);
return info;
}
if(!strncmp((const char*)fd->mount, fullpath, strlen(fd->mount))) {
sg_size_t *psize, *new_psize;
psize = (sg_size_t*)
- xbt_dict_get_or_null(findStorageOnMountList(fd->mount)->p_content,
+ xbt_dict_get_or_null(findStorageOnMountList(fd->mount)->content_,
fd->name);
new_psize = xbt_new(sg_size_t, 1);
*new_psize = *psize;
if (psize){// src file exists
- xbt_dict_remove(findStorageOnMountList(fd->mount)->p_content, fd->name);
+ xbt_dict_remove(findStorageOnMountList(fd->mount)->content_, fd->name);
char *path = (char *) xbt_malloc ((strlen(fullpath)-strlen(fd->mount)+1));
strncpy(path, fullpath+strlen(fd->mount),
strlen(fullpath)-strlen(fd->mount)+1);
- xbt_dict_set(findStorageOnMountList(fd->mount)->p_content, path,
+ xbt_dict_set(findStorageOnMountList(fd->mount)->content_, path,
new_psize,nullptr);
XBT_DEBUG("Move file from %s to %s, size '%llu'",fd->name, fullpath, *psize);
free(path);
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) {
+ xbt_dynar_t dyn = xbt_dynar_new(sizeof(simgrid::surf::VirtualMachineImpl*), nullptr);
- simgrid::surf::VirtualMachine *ws_vm = &*iter;
- if (this == ws_vm->getPm()->extension(simgrid::surf::HostImpl::EXTENSION_ID))
+ for (VirtualMachineImpl* ws_vm : VirtualMachineImpl::allVms_) {
+ if (this == ws_vm->getPm()->pimpl_)
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;
}
}}
