* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/plugins/vm/VirtualMachineImpl.hpp"
+#include "src/surf/FileImpl.hpp"
#include <string>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module");
* constraint (capacity) of the VM in the PM layer. If the VM does not have any
* active task, the dummy CPU action must be deactivated, so that the VM does
* not get any CPU share in the PM layer. */
-void HostModel::adjustWeightOfDummyCpuActions()
+void HostModel::ignoreEmptyVmInPmLMM()
{
/* iterate for all virtual machines */
for (s4u::VirtualMachine* ws_vm : vm::VirtualMachineImpl::allVms_) {
-
Cpu* cpu = ws_vm->pimpl_cpu;
+ int active_tasks = lmm_constraint_get_variable_amount(cpu->constraint());
- int is_active = lmm_constraint_used(cpu->model()->getMaxminSystem(), cpu->constraint());
-
- if (is_active) {
- /* some tasks exist on this VM */
- XBT_DEBUG("set the weight of the dummy CPU action on PM to 1");
-
- /* 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->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");
+ /* The impact of the VM over its PM is the min between its vCPU amount and the amount of tasks it contains */
+ int impact = std::min(active_tasks, ws_vm->pimpl_vm_->coreAmount());
- ws_vm->pimpl_vm_->action_->setPriority(0);
- }
+ XBT_DEBUG("set the weight of the dummy CPU action of VM%p on PM to %d (#tasks: %d)", ws_vm, impact, active_tasks);
+ ws_vm->pimpl_vm_->action_->setPriority(impact);
}
}
else
return -1.0;
}
+
Action* HostModel::executeParallelTask(int host_nb, simgrid::s4u::Host** host_list, double* flops_amount,
double* bytes_amount, double rate)
{
piface_->pimpl_ = this;
}
-simgrid::surf::Storage* HostImpl::findStorageOnMountList(const char* mount)
+simgrid::surf::StorageImpl* HostImpl::findStorageOnMountList(const char* mount)
{
XBT_DEBUG("Search for storage name '%s' on '%s'", mount, piface_->cname());
if (storage_.find(mount) == storage_.end())
return storage_.at(mount);
}
-xbt_dict_t HostImpl::getMountedStorageList()
-{
- xbt_dict_t storage_list = xbt_dict_new_homogeneous(nullptr);
- char* storage_name = nullptr;
-
- for (auto mnt : storage_) {
- storage_name = (char*)mnt.second->cname();
- xbt_dict_set(storage_list, mnt.first.c_str(), storage_name, nullptr);
- }
- return storage_list;
-}
-
void HostImpl::getAttachedStorageList(std::vector<const char*>* storages)
{
- xbt_lib_cursor_t cursor;
- char* key;
- void** data;
- 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(static_cast<const char*>(storage->attach_), piface_->cname())) {
- storages->push_back(storage->cname());
- }
- }
- }
-}
-
-Action* HostImpl::open(const char* fullpath)
-{
- simgrid::surf::Storage* st = nullptr;
- size_t longest_prefix_length = 0;
- std::string path;
- std::string mount_name;
-
- XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, piface_->cname());
- for (auto mnt : storage_) {
- XBT_DEBUG("See '%s'", mnt.first.c_str());
- std::string file_mount_name = std::string(fullpath).substr(0, mnt.first.size());
-
- if (file_mount_name == mnt.first && mnt.first.length() > longest_prefix_length) {
- /* The current mount name is found in the full path and is bigger than the previous*/
- longest_prefix_length = mnt.first.length();
- st = mnt.second;
- }
- }
- if (longest_prefix_length > 0) { /* Mount point found, split fullpath into mount_name and path+filename*/
- mount_name = std::string(fullpath).substr(0, longest_prefix_length);
- path = std::string(fullpath).substr(longest_prefix_length, strlen(fullpath));
- } else
- xbt_die("Can't find mount point for '%s' on '%s'", fullpath, piface_->cname());
-
- XBT_DEBUG("OPEN %s on disk '%s'", path.c_str(), st->cname());
- Action* action = st->open(mount_name.c_str(), path.c_str());
- return action;
+ for (auto s : storage_)
+ if (s.second->attach_ == piface_->cname())
+ storages->push_back(s.second->piface_.name());
}
Action* HostImpl::close(surf_file_t fd)
{
- simgrid::surf::Storage* st = findStorageOnMountList(fd->mount);
- XBT_DEBUG("CLOSE %s on disk '%s'", fd->name, st->cname());
+ simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount());
+ XBT_DEBUG("CLOSE %s on disk '%s'", fd->cname(), st->cname());
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->cname());
+ simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount());
+ XBT_DEBUG("READ %s on disk '%s'", fd->cname(), st->cname());
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->cname());
+ simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount());
+ XBT_DEBUG("WRITE %s on disk '%s'", fd->cname(), st->cname());
return st->write(fd, size);
}
int HostImpl::unlink(surf_file_t fd)
{
- if (!fd) {
+ if (not fd) {
XBT_WARN("No such file descriptor. Impossible to unlink");
return -1;
} else {
- simgrid::surf::Storage* st = findStorageOnMountList(fd->mount);
+ simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount());
/* Check if the file is on this storage */
- if (st->content_->find(fd->name) == st->content_->end()) {
- XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->name, st->cname());
+ if (st->content_->find(fd->cname()) == st->content_->end()) {
+ XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->cname(), st->cname());
return -1;
} else {
- XBT_DEBUG("UNLINK %s on disk '%s'", fd->name, st->cname());
- st->usedSize_ -= fd->size;
+ XBT_DEBUG("UNLINK %s on disk '%s'", fd->cname(), st->cname());
+ st->usedSize_ -= fd->size();
// Remove the file from storage
- sg_size_t* psize = st->content_->at(fd->name);
- delete psize;
- st->content_->erase(fd->name);
+ st->content_->erase(fd->cname());
- xbt_free(fd->name);
- xbt_free(fd->mount);
- xbt_free(fd);
return 0;
}
}
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->cname());
- xbt_dynar_push_as(info, void*, st->typeId_);
- xbt_dynar_push_as(info, void*, st->contentType_);
-
- return info;
+ return fd->size();
}
sg_size_t HostImpl::fileTell(surf_file_t fd)
{
- return fd->current_position;
+ return fd->tell();
}
int HostImpl::fileSeek(surf_file_t fd, sg_offset_t offset, int origin)
{
switch (origin) {
case SEEK_SET:
- fd->current_position = offset;
+ fd->setPosition(offset);
return 0;
case SEEK_CUR:
- fd->current_position += offset;
+ fd->incrPosition(offset);
return 0;
case SEEK_END:
- fd->current_position = fd->size + offset;
+ fd->setPosition(fd->size() + offset);
return 0;
default:
return -1;
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))) {
- std::map<std::string, sg_size_t*>* content = findStorageOnMountList(fd->mount)->content_;
- if (content->find(fd->name) != content->end()) { // src file exists
- sg_size_t* psize = content->at(std::string(fd->name));
- sg_size_t* new_psize = new sg_size_t;
- *new_psize = *psize;
- delete psize;
- content->erase(fd->name);
- std::string path = std::string(fullpath).substr(strlen(fd->mount), strlen(fullpath));
- content->insert({path.c_str(), new_psize});
- XBT_DEBUG("Move file from %s to %s, size '%llu'", fd->name, fullpath, *psize);
+ if (not strncmp(fd->mount(), fullpath, strlen(fd->mount()))) {
+ std::map<std::string, sg_size_t>* content = findStorageOnMountList(fd->mount())->content_;
+ if (content->find(fd->name()) != content->end()) { // src file exists
+ sg_size_t new_size = content->at(fd->name());
+ content->erase(fd->name());
+ std::string path = std::string(fullpath).substr(strlen(fd->mount()), strlen(fullpath));
+ content->insert({path.c_str(), new_size});
+ XBT_DEBUG("Move file from %s to %s, size '%llu'", fd->cname(), fullpath, new_size);
return 0;
} else {
- XBT_WARN("File %s doesn't exist", fd->name);
+ XBT_WARN("File %s doesn't exist", fd->cname());
return -1;
}
} else {
- XBT_WARN("New full path %s is not on the same mount point: %s. Action has been canceled.", fullpath, fd->mount);
+ XBT_WARN("New full path %s is not on the same mount point: %s. Action has been canceled.", fullpath, fd->mount());
return -1;
}
}
