X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3eaab01ff3aaf3b8addf247073237c5891f485d4..6cf6f6913a06a9b7e64923042e25049b529e5cdc:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 48679307f8..0b5ac06d5c 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -37,7 +37,10 @@ void HostModel::ignoreEmptyVmInPmLMM() int impact = std::min(active_tasks, ws_vm->pimpl_vm_->coreAmount()); 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); + if (impact > 0) + ws_vm->pimpl_vm_->action_->setSharingWeight(1. / impact); + else + ws_vm->pimpl_vm_->action_->setSharingWeight(0.); } } @@ -134,30 +137,6 @@ Action* HostImpl::write(surf_file_t fd, sg_size_t size) return st->write(fd, size); } -int HostImpl::unlink(surf_file_t fd) -{ - if (not fd) { - XBT_WARN("No such file descriptor. Impossible to unlink"); - return -1; - } else { - - simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount()); - /* Check if the file is on this storage */ - 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->cname(), st->cname()); - st->usedSize_ -= fd->size(); - - // Remove the file from storage - st->content_->erase(fd->cname()); - - return 0; - } - } -} - int HostImpl::fileMove(surf_file_t fd, const char* fullpath) { /* Check if the new full path is on the same mount point */