Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[sonar] Assert that pointer is not null.
[simgrid.git] / src / plugins / host_load.cpp
index 1688ef3..19c495f 100644 (file)
@@ -205,12 +205,12 @@ void sg_host_load_plugin_init()
   });
 
   simgrid::kernel::activity::ExecImpl::on_creation.connect([](simgrid::kernel::activity::ExecImpl& activity) {
-    if (activity.host_ != nullptr) { // We only run on one host
-      simgrid::s4u::Host* host         = activity.host_;
+    if (activity.get_host_number() == 1) { // We only run on one host
+      simgrid::s4u::Host* host         = activity.get_host();
       simgrid::s4u::VirtualMachine* vm = dynamic_cast<simgrid::s4u::VirtualMachine*>(host);
       if (vm != nullptr)
         host = vm->get_pm();
-
+      xbt_assert(host != nullptr);
       host->extension<HostLoad>()->add_activity(&activity);
       host->extension<HostLoad>()->update(); // If the system was idle until now, we need to update *before*
                                              // this computation starts running so we can keep track of the
@@ -221,12 +221,12 @@ void sg_host_load_plugin_init()
     }
   });
   simgrid::kernel::activity::ExecImpl::on_completion.connect([](simgrid::kernel::activity::ExecImpl const& activity) {
-    if (activity.host_ != nullptr) { // We only run on one host
-      simgrid::s4u::Host* host         = activity.host_;
+    if (activity.get_host_number() == 1) { // We only run on one host
+      simgrid::s4u::Host* host         = activity.get_host();
       simgrid::s4u::VirtualMachine* vm = dynamic_cast<simgrid::s4u::VirtualMachine*>(host);
       if (vm != nullptr)
         host = vm->get_pm();
-
+      xbt_assert(host != nullptr);
       host->extension<HostLoad>()->update();
     }
     else { // This runs on multiple hosts