[SMPI/LB] Normalize load + notify heap of changes

[simgrid.git] / src / smpi / plugins / load_balancer / LoadBalancer.cpp

diff --git a/src/smpi/plugins/load_balancer/LoadBalancer.cpp b/src/smpi/plugins/load_balancer/LoadBalancer.cpp
index a95a116a7b86dd00a5fa45b3013599e71e5e92d7..dde6fa6ac8e18b5fb5d9ce4fd14f26d7c270c163 100644 (file)
--- a/src/smpi/plugins/load_balancer/LoadBalancer.cpp
+++ b/src/smpi/plugins/load_balancer/LoadBalancer.cpp
@@ -83,11 +83,14 @@ void LoadBalancer::run()
   for (auto& host : available_hosts) {
     std::vector<simgrid::s4u::ActorPtr> actors = host->get_all_actors();
     heap_handle update_handle                  = usable_hosts.push(host); // Required to update elements in the heap
-    additional_load[host]                      = {update_handle, 0}; // Save the handle for later
+    additional_load[host]                      = {update_handle, 0};      // Save the handle for later
+    const double total_flops_computed          = sg_host_get_computed_flops(host);
     for (auto& actor : actors) {
-      additional_load[host].load += actor_computation[actor->get_pid()];
+      additional_load[host].load += actor_computation[actor->get_pid()] / total_flops_computed; // Normalize load - this allows comparison
+                                                                                                // even between hosts with different frequencies
       XBT_DEBUG("Actor %li -> %f", actor->get_pid(), actor_computation[actor->get_pid()]);
     }
+    usable_hosts.increase(update_handle);
     XBT_DEBUG("Host %s initialized to %f", host->get_cname(), additional_load[host].load);
   }