Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / surf / HostImpl.cpp

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index 551615a..b212a16 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -25,29 +25,18 @@ namespace surf {
  * 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_INFO("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);
   }
 }
 
@@ -106,7 +95,7 @@ HostImpl::HostImpl(s4u::Host* host) : piface_(host)
   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())
@@ -129,24 +118,14 @@ xbt_dict_t HostImpl::getMountedStorageList()
 
 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());
-      }
-    }
-  }
+  for (auto s : storage_)
+    if (not strcmp(static_cast<const char*>(s.second->attach_), piface_->cname()))
+      storages->push_back(s.second->piface_.name());
 }
 
 Action* HostImpl::open(const char* fullpath)
 {
-  simgrid::surf::Storage* st = nullptr;
+  simgrid::surf::StorageImpl* st = nullptr;
   size_t longest_prefix_length = 0;
   std::string path;
   std::string mount_name;
@@ -175,33 +154,33 @@ Action* HostImpl::open(const char* fullpath)
 
 Action* HostImpl::close(surf_file_t fd)
 {
-  simgrid::surf::Storage* st = findStorageOnMountList(fd->mount);
+  simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount);
   XBT_DEBUG("CLOSE %s on disk '%s'", fd->name, st->cname());
   return st->close(fd);
 }
 
 Action* HostImpl::read(surf_file_t fd, sg_size_t size)
 {
-  simgrid::surf::Storage* st = findStorageOnMountList(fd->mount);
+  simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount);
   XBT_DEBUG("READ %s on disk '%s'", fd->name, 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);
+  simgrid::surf::StorageImpl* st = findStorageOnMountList(fd->mount);
   XBT_DEBUG("WRITE %s on disk '%s'", fd->name, 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());
@@ -230,7 +209,7 @@ sg_size_t HostImpl::getSize(surf_file_t fd)
 
 xbt_dynar_t HostImpl::getInfo(surf_file_t fd)
 {
-  simgrid::surf::Storage* st = findStorageOnMountList(fd->mount);
+  simgrid::surf::StorageImpl* 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);
@@ -267,7 +246,7 @@ int HostImpl::fileSeek(surf_file_t fd, sg_offset_t offset, int origin)
 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))) {
+  if (not 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));