X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/86907b33d6c8f6f749d37a7bf9bcad5e6dcc0695..03905d3412f2a4f915f4a1a1564b87ef7adff11a:/deployment.cpp?ds=sidebyside

diff --git a/deployment.cpp b/deployment.cpp
index c5a1f9d..bbb47e5 100644
--- a/deployment.cpp
+++ b/deployment.cpp
@@ -1,20 +1,29 @@
-#include "deployment.h"
-
+#include <algorithm>
+#include <cmath>
+#include <cstdlib>
+#include <functional>
 #include <iomanip>
+#include <numeric>
 #include <sstream>
+#include <vector>
 #include <msg/msg.h>
 #include <xbt/dynar.h>
 #include <xbt/log.h>
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(depl);
+
 #include "hostdata.h"
+#include "misc.h"
 #include "options.h"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(depl);
+#include "deployment.h"
 
 void MY_launch_application()
 {
     deployment_generator* gen;
     gen = opt::topologies.new_instance(opt::auto_depl::topology);
     gen->generate();
+    gen->distribute_load();
     gen->deploy();
     delete gen;
 }
@@ -22,7 +31,6 @@ void MY_launch_application()
 deployment_generator::deployment_generator()
     : hosts(opt::auto_depl::nhosts)
 {
-    set_load(0, opt::auto_depl::load);
 }
 
 void deployment_generator::set_load(int host, double load)
@@ -41,24 +49,68 @@ void deployment_generator::set_link(int host1, int host2)
     set_neighbor(host2, host1);
 }
 
+void deployment_generator::distribute_load()
+{
+    using std::placeholders::_1;
+
+    if (!opt::auto_depl::random_distribution) {
+        set_load(0, opt::auto_depl::load);
+        return;
+    }
+    std::vector<double> loads(hosts.size());
+    if (opt::auto_depl::random_seed != 1) {
+        srand48(opt::auto_depl::random_seed);
+        std::generate(loads.begin(), loads.end(), drand48);
+    } else {
+        std::fill(loads.begin(), loads.end(), 1.0);
+    }
+    double factor = opt::auto_depl::load /
+        std::accumulate(loads.begin(), loads.end(), 0.0);
+    std::transform(loads.begin(), loads.end(), loads.begin(),
+                   std::bind(std::multiplies<double>(), _1, factor));
+    if (opt::integer_transfer) {
+        double iload;
+        double residue = 0.0;
+        unsigned i;
+        for (i = 0 ; i < hosts.size() - 1; ++i) {
+            if (residue < 0.0)
+                iload = std::floor(loads[i]);
+            else if (residue > 0.0)
+                iload = std::ceil(loads[i]);
+            else // residue == 0.0
+                iload = std::round(loads[i]);
+            residue += (loads[i] - iload);
+            loads[i] = iload;
+        }
+        // abs(round(...)) to avoid rounding errors, or a value of -0
+        // Note: i == hosts.size() - 1
+        iload = std::abs(std::round(loads[i] + residue));
+        loads[i] = iload;
+        // final sanity check
+        xbt_assert(opt::auto_depl::load ==
+                   std::accumulate(loads.begin(), loads.end(), 0.0));
+    }
+    for (unsigned i = 0 ; i < hosts.size() ; ++i)
+        set_load(i, loads[i]);
+}
+
 void deployment_generator::deploy()
 {
-    const char* func = "simulation_main";
     xbt_dynar_t args = xbt_dynar_new(sizeof(const char*), NULL);
     for (unsigned i = 0 ; i < hosts.size() ; ++i) {
         const char* hostname = hostdata::at(i).get_name();
         std::ostringstream oss;
         oss << std::setprecision(12) << hosts[i].load;
         std::string strload = oss.str();
-        DEBUG2("%s/load -> \"%s\"", hostname, strload.c_str());
+        XBT_DEBUG("%s/load -> \"%s\"", hostname, strload.c_str());
         xbt_dynar_push_as(args, const char*, strload.c_str());
         for (unsigned j = 0 ; j < hosts[i].neighbors.size() ; ++j) {
             int neighbor = hosts[i].neighbors[j];
             const char* neighbor_name = hostdata::at(neighbor).get_name();
-            DEBUG2("%s/neighbor -> \"%s\"", hostname, neighbor_name);
+            XBT_DEBUG("%s/neighbor -> \"%s\"", hostname, neighbor_name);
             xbt_dynar_push_as(args, const char*, neighbor_name);
         }
-        MSG_set_function(hostname, func, args);
+        MSG_set_function(hostname, "compute", args);
         xbt_dynar_reset(args);
     }
     xbt_dynar_free(&args);
@@ -122,6 +174,66 @@ void deployment_star::generate()
         set_link(0, i);
 }
 
-// void deployment_torus::generate()
-// {
-// }
+void deployment_torus::generate()
+{
+    unsigned a = 0;
+    unsigned b = size();
+    while (a + 1 < b) {
+        unsigned c = (a + b) / 2;
+        if (c * c < size())
+            a = c;
+        else
+            b = c;
+    }
+    unsigned width = b;
+    // here width == std::ceil(std::sqrt(size))
+
+    unsigned first_on_last_line = (size() - 1) - (size() - 1) % width;
+    XBT_DEBUG("torus size = %zu ; width = %u ; height = %zu ; foll = %u",
+              size(), width, size() / width + !!(size() % width),
+              first_on_last_line);
+    for (unsigned i = 0; i < size(); i++) {
+        unsigned next_line;
+        unsigned prev_line;
+        unsigned next_column;
+        unsigned prev_column;
+
+        next_line = i + width;
+        if (next_line >= size())
+            next_line %= width; // rewind
+
+        if (i >= width) {
+            prev_line = i - width;
+        } else {
+            prev_line = first_on_last_line + i; // rewind
+            if (prev_line >= size())
+                prev_line -= width; // need to go at last but one line
+        }
+
+        if (i != size() - 1) {
+            next_column = i + 1;
+            if (next_column % width == 0)
+                next_column -= width; // rewind
+        } else {
+            next_column = first_on_last_line; // special case for last cell
+        }
+
+        if (i % width != 0) {
+            prev_column = i - 1;
+        } else if (i < first_on_last_line) {
+            prev_column = i + width - 1; // rewind
+        } else {
+            prev_column = size() - 1; // special case for 1st cell of last line
+        }
+        if (next_line != i) {
+            set_neighbor(i, next_line);
+            if (prev_line != next_line)
+                set_neighbor(i, prev_line);
+        }
+        if (next_column != i) {
+            set_neighbor(i, next_column);
+            if (prev_column != next_column)
+                set_neighbor(i, prev_column);
+        }
+    }
+}