X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d785a64b1830b6a5d05561316ef7161ee1c67671..18bee871381a6ce670d9da211f43ab9b55fdc350:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index c7e5ec9a0d..3ffb283519 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -11,10 +11,9 @@ #include "simgrid/sg_config.h" #include "network_interface.hpp" -#include "virtual_machine.hpp" +#include "src/plugins/vm/VirtualMachineImpl.hpp" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, - "Logging specific to the SURF host module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module"); simgrid::surf::HostModel *surf_host_model = nullptr; @@ -25,18 +24,9 @@ simgrid::surf::HostModel *surf_host_model = nullptr; namespace simgrid { namespace surf { -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 *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 @@ -45,12 +35,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 (s4u::VirtualMachine* ws_vm : vm::VirtualMachineImpl::allVms_) { - VirtualMachine *ws_vm = &*iter; - Cpu *cpu = ws_vm->p_cpu; + Cpu* cpu = ws_vm->pimpl_cpu; int is_active = lmm_constraint_used(cpu->getModel()->getMaxminSystem(), cpu->getConstraint()); @@ -60,37 +47,28 @@ void HostModel::adjustWeightOfDummyCpuActions() /* FIXME: we should use lmm_update_variable_weight() ? */ /* FIXME: If we assign 1.05 and 0.05, the system makes apparently wrong values. */ - ws_vm->action_->setPriority(1); + ws_vm->pimpl_vm_->action_->setPriority(1); } else { /* no task exits on this VM */ XBT_DEBUG("set the weight of the dummy CPU action on PM to 0"); - ws_vm->action_->setPriority(0); + ws_vm->pimpl_vm_->action_->setPriority(0); } } } -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; - if ((host_nb == 1) - && (cost_or_zero(bytes_amount, 0) == 0.0)){ + Action* action = nullptr; + if ((host_nb == 1) && (cost_or_zero(bytes_amount, 0) == 0.0)) { 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); - } else if ((host_nb == 2) - && (cost_or_zero(flops_amount, 0) == 0.0) - && (cost_or_zero(flops_amount, 1) == 0.0)) { - int i,nb = 0; + } else if ((host_nb == 1) && (cost_or_zero(flops_amount, 0) == 0.0)) { + 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)) { + int i, nb = 0; double value = 0.0; for (i = 0; i < host_nb * host_nb; i++) { @@ -100,16 +78,18 @@ 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 { - xbt_die("Cannot have a communication that is not a simple point-to-point in this model. You should consider using the ptask model"); + xbt_die("Cannot have a communication with no flop to exchange in this model. You should consider using the " + "ptask model"); + } else { + xbt_die("Cannot have a communication that is not a simple point-to-point in this model. You should consider " + "using the ptask model"); } - } else - xbt_die("This model only accepts one of the following. You should consider using the ptask model for the other cases.\n - execution with one host only and no communication\n - Self-comms with one host only\n - Communications with two hosts and no computation"); + } else + xbt_die("This model only accepts one of the following. You should consider using the ptask model for the other " + "cases.\n - execution with one host only and no communication\n - Self-comms with one host only\n - " + "Communications with two hosts and no computation"); #undef cost_or_zero xbt_free(host_list); return action; @@ -118,80 +98,30 @@ Action *HostModel::executeParallelTask(int host_nb, /************ * Resource * ************/ - - -void HostImpl::classInit() -{ - if (!EXTENSION_ID.valid()) { - EXTENSION_ID = simgrid::s4u::Host::extension_create(); - } -} - -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) -{ - 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) +HostImpl::HostImpl(s4u::Host* host, xbt_dynar_t storage) : storage_(storage), piface_(host) { - p_params.ramsize = 0; + piface_->pimpl_ = this; } /** @brief use destroy() instead of this destructor */ -HostImpl::~HostImpl() -{ -} +HostImpl::~HostImpl() = default; -void HostImpl::attach(simgrid::s4u::Host* host) +simgrid::surf::Storage* HostImpl::findStorageOnMountList(const char* mount) { - 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); - } -} - -simgrid::surf::Storage *HostImpl::findStorageOnMountList(const char* mount) -{ - simgrid::surf::Storage *st = nullptr; + simgrid::surf::Storage* st = nullptr; 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("See '%s'",mnt.name); - if(!strcmp(mount,mnt.name)){ + XBT_DEBUG("Search for storage name '%s' on '%s'", mount, piface_->cname()); + xbt_dynar_foreach (storage_, cursor, mnt) { + XBT_DEBUG("See '%s'", mnt.name); + if (!strcmp(mount, mnt.name)) { st = static_cast(mnt.storage); break; } } - if(!st) xbt_die("Can't find mount '%s' for '%s'", mount, getName()); + if (!st) + xbt_die("Can't find mount '%s' for '%s'", mount, piface_->cname()); return st; } @@ -200,11 +130,11 @@ xbt_dict_t HostImpl::getMountedStorageList() s_mount_t mnt; unsigned int i; xbt_dict_t storage_list = xbt_dict_new_homogeneous(nullptr); - char *storage_name = nullptr; + char* storage_name = nullptr; - xbt_dynar_foreach(p_storage,i,mnt){ - storage_name = (char *)static_cast(mnt.storage)->getName(); - xbt_dict_set(storage_list,mnt.name,storage_name,nullptr); + xbt_dynar_foreach (storage_, i, mnt) { + storage_name = (char*)static_cast(mnt.storage)->getName(); + xbt_dict_set(storage_list, mnt.name, storage_name, nullptr); } return storage_list; } @@ -212,205 +142,180 @@ xbt_dict_t HostImpl::getMountedStorageList() xbt_dynar_t HostImpl::getAttachedStorageList() { xbt_lib_cursor_t cursor; - char *key; - void **data; + char* key; + 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(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()); + 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( + xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL)); + if (!strcmp((const char*)storage->attach_, piface_->cname())) { + xbt_dynar_push_as(result, void*, (void*)storage->getName()); + } } } - } return result; -} - -Action *HostImpl::open(const char* fullpath) { - - simgrid::surf::Storage *st = nullptr; - s_mount_t mnt; - unsigned int cursor; - size_t longest_prefix_length = 0; - char *path = nullptr; - 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("See '%s'",mnt.name); - file_mount_name = (char *) xbt_malloc ((strlen(mnt.name)+1)); - strncpy(file_mount_name,fullpath,strlen(mnt.name)+1); - file_mount_name[strlen(mnt.name)] = '\0'; - - if(!strcmp(file_mount_name,mnt.name) && strlen(mnt.name)>longest_prefix_length) - {/* The current mount name is found in the full path and is bigger than the previous*/ - longest_prefix_length = strlen(mnt.name); - st = static_cast(mnt.storage); } - free(file_mount_name); - } - if(longest_prefix_length>0) - { /* Mount point found, split fullpath into mount_name and path+filename*/ - path = (char *) xbt_malloc ((strlen(fullpath)-longest_prefix_length+1)); - mount_name = (char *) xbt_malloc ((longest_prefix_length+1)); - strncpy(mount_name, fullpath, longest_prefix_length+1); - strncpy(path, fullpath+longest_prefix_length, strlen(fullpath)-longest_prefix_length+1); - path[strlen(fullpath)-longest_prefix_length] = '\0'; - mount_name[longest_prefix_length] = '\0'; - } - else - xbt_die("Can't find mount point for '%s' on '%s'", fullpath, getName()); - - XBT_DEBUG("OPEN %s on disk '%s'",path, st->getName()); - Action *action = st->open((const char*)mount_name, (const char*)path); - free((char*)path); - free((char*)mount_name); - return action; -} - -Action *HostImpl::close(surf_file_t fd) { - simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); - XBT_DEBUG("CLOSE %s on disk '%s'",fd->name, st->getName()); - return st->close(fd); -} - -Action *HostImpl::read(surf_file_t fd, sg_size_t size) { - simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); - XBT_DEBUG("READ %s on disk '%s'",fd->name, st->getName()); - return st->read(fd, size); -} -Action *HostImpl::write(surf_file_t fd, sg_size_t size) { - simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); - XBT_DEBUG("WRITE %s on disk '%s'",fd->name, st->getName()); - return st->write(fd, size); -} - -int HostImpl::unlink(surf_file_t fd) { - if (!fd){ - XBT_WARN("No such file descriptor. Impossible to unlink"); - return -1; - } else { - - 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)){ - 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; - - // Remove the file from storage - xbt_dict_remove(st->p_content, fd->name); - - xbt_free(fd->name); - xbt_free(fd->mount); - xbt_free(fd); - return 0; + Action* HostImpl::open(const char* fullpath) + { + + simgrid::surf::Storage* st = nullptr; + s_mount_t mnt; + unsigned int cursor; + size_t longest_prefix_length = 0; + char* path = nullptr; + char* file_mount_name = nullptr; + char* mount_name = nullptr; + + XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, piface_->cname()); + xbt_dynar_foreach (storage_, cursor, mnt) { + XBT_DEBUG("See '%s'", mnt.name); + file_mount_name = (char*)xbt_malloc((strlen(mnt.name) + 1)); + strncpy(file_mount_name, fullpath, strlen(mnt.name) + 1); + file_mount_name[strlen(mnt.name)] = '\0'; + + if (!strcmp(file_mount_name, mnt.name) && + strlen(mnt.name) > longest_prefix_length) { /* The current mount name is found in the full path and is + bigger than the previous*/ + longest_prefix_length = strlen(mnt.name); + st = static_cast(mnt.storage); + } + free(file_mount_name); + } + if (longest_prefix_length > 0) { /* Mount point found, split fullpath into mount_name and path+filename*/ + path = (char*)xbt_malloc((strlen(fullpath) - longest_prefix_length + 1)); + mount_name = (char*)xbt_malloc((longest_prefix_length + 1)); + strncpy(mount_name, fullpath, longest_prefix_length + 1); + strncpy(path, fullpath + longest_prefix_length, strlen(fullpath) - longest_prefix_length + 1); + path[strlen(fullpath) - longest_prefix_length] = '\0'; + mount_name[longest_prefix_length] = '\0'; + } else + xbt_die("Can't find mount point for '%s' on '%s'", fullpath, piface_->cname()); + + XBT_DEBUG("OPEN %s on disk '%s'", path, st->getName()); + Action* action = st->open((const char*)mount_name, (const char*)path); + free((char*)path); + free((char*)mount_name); + return action; } - } -} -sg_size_t HostImpl::getSize(surf_file_t fd){ - return fd->size; -} - -xbt_dynar_t HostImpl::getInfo( surf_file_t fd) -{ - simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); - sg_size_t *psize = xbt_new(sg_size_t, 1); - *psize = fd->size; - xbt_dynar_t info = xbt_dynar_new(sizeof(void*), nullptr); - 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); - - return info; -} - -sg_size_t HostImpl::fileTell(surf_file_t fd){ - return fd->current_position; -} + Action* HostImpl::close(surf_file_t fd) + { + simgrid::surf::Storage* st = findStorageOnMountList(fd->mount); + XBT_DEBUG("CLOSE %s on disk '%s'", fd->name, st->getName()); + return st->close(fd); + } -int HostImpl::fileSeek(surf_file_t fd, sg_offset_t offset, int origin){ - - switch (origin) { - case SEEK_SET: - fd->current_position = offset; - return 0; - case SEEK_CUR: - fd->current_position += offset; - return 0; - case SEEK_END: - fd->current_position = fd->size + offset; - return 0; - default: - return -1; - } -} + Action* HostImpl::read(surf_file_t fd, sg_size_t size) + { + simgrid::surf::Storage* st = findStorageOnMountList(fd->mount); + XBT_DEBUG("READ %s on disk '%s'", fd->name, st->getName()); + return st->read(fd, size); + } -int HostImpl::fileMove(surf_file_t fd, const char* fullpath){ - /* Check if the new full path is on the same mount point */ - 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, - 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); - 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, - new_psize,nullptr); - XBT_DEBUG("Move file from %s to %s, size '%llu'",fd->name, fullpath, *psize); - free(path); - return 0; - } else { - XBT_WARN("File %s doesn't exist", fd->name); - return -1; + Action* HostImpl::write(surf_file_t fd, sg_size_t size) + { + simgrid::surf::Storage* st = findStorageOnMountList(fd->mount); + XBT_DEBUG("WRITE %s on disk '%s'", fd->name, st->getName()); + return st->write(fd, size); } - } else { - XBT_WARN("New full path %s is not on the same mount point: %s. Action has been canceled.", - fullpath, fd->mount); - return -1; - } -} -xbt_dynar_t HostImpl::getVms() -{ - xbt_dynar_t dyn = xbt_dynar_new(sizeof(simgrid::surf::VirtualMachine*), nullptr); + int HostImpl::unlink(surf_file_t fd) + { + if (!fd) { + XBT_WARN("No such file descriptor. Impossible to unlink"); + return -1; + } else { + + simgrid::surf::Storage* st = findStorageOnMountList(fd->mount); + /* Check if the file is on this storage */ + 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->usedSize_ -= fd->size; + + // Remove the file from storage + xbt_dict_remove(st->content_, fd->name); + + xbt_free(fd->name); + xbt_free(fd->mount); + xbt_free(fd); + return 0; + } + } + } - /* 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) { + sg_size_t HostImpl::getSize(surf_file_t fd) + { + return fd->size; + } - simgrid::surf::VirtualMachine *ws_vm = &*iter; - if (this == ws_vm->getPm()->extension(simgrid::surf::HostImpl::EXTENSION_ID)) - xbt_dynar_push(dyn, &ws_vm); - } + xbt_dynar_t HostImpl::getInfo(surf_file_t fd) + { + simgrid::surf::Storage* st = findStorageOnMountList(fd->mount); + sg_size_t* psize = xbt_new(sg_size_t, 1); + *psize = fd->size; + xbt_dynar_t info = xbt_dynar_new(sizeof(void*), nullptr); + 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->typeId_); + xbt_dynar_push_as(info, void*, st->contentType_); + + return info; + } - return dyn; -} + sg_size_t HostImpl::fileTell(surf_file_t fd) + { + return fd->current_position; + } -void HostImpl::getParams(vm_params_t params) -{ - *params = p_params; -} + int HostImpl::fileSeek(surf_file_t fd, sg_offset_t offset, int origin) + { + + switch (origin) { + case SEEK_SET: + fd->current_position = offset; + return 0; + case SEEK_CUR: + fd->current_position += offset; + return 0; + case SEEK_END: + fd->current_position = fd->size + offset; + return 0; + default: + return -1; + } + } -void HostImpl::setParams(vm_params_t params) -{ - /* may check something here. */ - p_params = *params; -} + int HostImpl::fileMove(surf_file_t fd, const char* fullpath) + { + /* Check if the new full path is on the same mount point */ + if (!strncmp((const char*)fd->mount, fullpath, strlen(fd->mount))) { + sg_size_t* psize = (sg_size_t*)xbt_dict_get_or_null(findStorageOnMountList(fd->mount)->content_, fd->name); + if (psize) { // src file exists + sg_size_t* new_psize = xbt_new(sg_size_t, 1); + *new_psize = *psize; + 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)->content_, path, new_psize, nullptr); + XBT_DEBUG("Move file from %s to %s, size '%llu'", fd->name, fullpath, *psize); + free(path); + return 0; + } else { + XBT_WARN("File %s doesn't exist", fd->name); + return -1; + } + } else { + XBT_WARN("New full path %s is not on the same mount point: %s. Action has been canceled.", fullpath, fd->mount); + return -1; + } + } -}} + } + }