X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/014983949544db9a324cece29a0ccc46b1e3e1f3..d79c6aa768cb68806408632c832e5e1330e451a6:/deployment.cpp

diff --git a/deployment.cpp b/deployment.cpp
index 1b26a8a..70bd8b3 100644
--- a/deployment.cpp
+++ b/deployment.cpp
@@ -1,14 +1,16 @@
-#include "deployment.h"
-
 #include <iomanip>
 #include <sstream>
 #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()
 {
@@ -43,54 +45,26 @@ void deployment_generator::set_link(int host1, int host2)
 
 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);
 }
 
-void deployment_line::generate()
-{
-    for (unsigned i = 0 ; i < size() - 1 ; ++i)
-        set_link(i, i + 1);
-}
-
-void deployment_ring::generate()
-{
-    set_neighbor(0, size() - 1);
-    for (unsigned i = 0 ; i < size() - 1 ; ++i)
-        set_link(i, i + 1);
-    set_neighbor(size() - 1, 0);
-}
-
-void deployment_star::generate()
-{
-    for (unsigned i = 1 ; i < size() ; ++i)
-        set_link(0, i);
-}
-
-void deployment_clique::generate()
-{
-    for (unsigned i = 0 ; i < size() ; ++i)
-        for (unsigned j = 0 ; j < i ; ++j)
-            set_link(i, j);
-}
-
 void deployment_btree::generate()
 {
     for (unsigned i = 0 ; i < size() / 2 ; ++i) {
@@ -104,9 +78,12 @@ void deployment_btree::generate()
     }
 }
 
-// void deployment_torus::generate()
-// {
-// }
+void deployment_clique::generate()
+{
+    for (unsigned i = 0 ; i < size() ; ++i)
+        for (unsigned j = 0 ; j < i ; ++j)
+            set_link(i, j);
+}
 
 void deployment_hcube::generate()
 {
@@ -125,3 +102,87 @@ void deployment_hcube::generate()
                 set_link(i, j);
         }
 }
+
+void deployment_line::generate()
+{
+    for (unsigned i = 0 ; i < size() - 1 ; ++i)
+        set_link(i, i + 1);
+}
+
+void deployment_ring::generate()
+{
+    set_neighbor(0, size() - 1);
+    for (unsigned i = 0 ; i < size() - 1 ; ++i)
+        set_link(i, i + 1);
+    set_neighbor(size() - 1, 0);
+}
+
+void deployment_star::generate()
+{
+    for (unsigned i = 1 ; i < size() ; ++i)
+        set_link(0, i);
+}
+
+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 == ceil(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);
+        }
+    }
+}