don't test pointers after dereferencing them (thanks, sonar)

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

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index 2943b4d..c727c67 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -10,8 +10,8 @@
 #include "src/surf/HostImpl.hpp"
 #include "simgrid/sg_config.h"
 
-#include "VirtualMachineImpl.hpp"
 #include "network_interface.hpp"
+#include "src/plugins/vm/VirtualMachineImpl.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module");
 
@@ -35,9 +35,9 @@ namespace surf {
 void HostModel::adjustWeightOfDummyCpuActions()
 {
   /* iterate for all virtual machines */
-  for (VirtualMachineImpl* ws_vm : VirtualMachineImpl::allVms_) {
+  for (s4u::VirtualMachine* ws_vm : vm::VirtualMachineImpl::allVms_) {
 
-    Cpu* cpu = ws_vm->piface_->pimpl_cpu;
+    Cpu* cpu = ws_vm->pimpl_cpu;
 
     int is_active = lmm_constraint_used(cpu->getModel()->getMaxminSystem(), cpu->getConstraint());
 
@@ -47,13 +47,13 @@ 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);
     }
   }
 }
@@ -296,11 +296,10 @@ xbt_dynar_t HostImpl::getAttachedStorageList()
     {
       /* 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)->content_, fd->name);
-        new_psize  = xbt_new(sg_size_t, 1);
-        *new_psize = *psize;
+        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);
@@ -318,16 +317,5 @@ xbt_dynar_t HostImpl::getAttachedStorageList()
       }
     }
 
-    xbt_dynar_t HostImpl::getVms()
-    {
-      xbt_dynar_t dyn = xbt_dynar_new(sizeof(simgrid::surf::VirtualMachineImpl*), nullptr);
-
-      for (VirtualMachineImpl* ws_vm : VirtualMachineImpl::allVms_) {
-        if (this == ws_vm->getPm()->pimpl_)
-          xbt_dynar_push(dyn, &ws_vm);
-      }
-
-      return dyn;
-    }
     }
     }