Add default auto_depl::topology...

[loba.git] / deployment.cpp

diff --git a/deployment.cpp b/deployment.cpp
index a0fad272fdf8f1db947c683a674d7748c57acee3..c5a1f9d40decaab7bc73e6f05e50c87bf6ca845a 100644 (file)
--- a/deployment.cpp
+++ b/deployment.cpp
@@ -1,29 +1,127 @@
 #include "deployment.h"
 
 #include "deployment.h"
 

-#include <vector>
+#include <iomanip>
+#include <sstream>

 #include <msg/msg.h>
 #include <xbt/dynar.h>
 #include <msg/msg.h>
 #include <xbt/dynar.h>

-#include <xbt/sysdep.h>
+#include <xbt/log.h>

 #include "hostdata.h"
 #include "hostdata.h"

+#include "options.h"

 
 

+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(depl);

 
 void MY_launch_application()
 {
 
 void MY_launch_application()
 {

-    xbt_assert(hostdata::size() >= 2);
+    deployment_generator* gen;
+    gen = opt::topologies.new_instance(opt::auto_depl::topology);
+    gen->generate();
+    gen->deploy();
+    delete gen;
+}
+
+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)
+{
+    hosts[host].load = load;
+}
+
+void deployment_generator::set_neighbor(int host, int neighbor)
+{
+    hosts[host].neighbors.push_back(neighbor);
+}
+
+void deployment_generator::set_link(int host1, int host2)
+{
+    set_neighbor(host1, host2);
+    set_neighbor(host2, host1);
+}
+
+void deployment_generator::deploy()
+{

     const char* func = "simulation_main";
     const char* func = "simulation_main";

-    xbt_dynar_t p0_args = xbt_dynar_new(sizeof(const char*), NULL);
-    xbt_dynar_t p1_args = xbt_dynar_new(sizeof(const char*), NULL);
+    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_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_dynar_push_as(args, const char*, neighbor_name);
+        }
+        MSG_set_function(hostname, func, args);
+        xbt_dynar_reset(args);
+    }
+    xbt_dynar_free(&args);
+}

 
 

-    xbt_dynar_push_as(p0_args, const char*, "33");
-    xbt_dynar_push_as(p0_args, const char*, hostdata::at(1).get_name());
+void deployment_btree::generate()
+{
+    for (unsigned i = 0 ; i < size() / 2 ; ++i) {
+        unsigned left_child = 2 * i + 1;
+        unsigned right_child = 2 * i + 2;
+        if (left_child < size()) {
+            set_link(i, left_child);
+            if (right_child < size())
+                set_link(i, right_child);
+        }
+    }
+}
+
+void deployment_clique::generate()
+{
+    for (unsigned i = 0 ; i < size() ; ++i)
+        for (unsigned j = 0 ; j < i ; ++j)
+            set_link(i, j);
+}

 
 

-    xbt_dynar_push_as(p1_args, const char*, "42");
-    xbt_dynar_push_as(p1_args, const char*, hostdata::at(0).get_name());
+void deployment_hcube::generate()
+{
+    for (unsigned i = 0 ; i < size() ; ++i)
+        for (unsigned j = 0 ; j < i ; ++j) {
+            // Adapted from rom http://en.wikipedia.org/wiki/Hamming_distance
+            unsigned dist = 0;
+            unsigned val = i ^ j;

 
 

-    MSG_set_function(hostdata::at(0).get_name(), func, p0_args);
-    MSG_set_function(hostdata::at(1).get_name(), func, p1_args);
+            // Count the number of set bits
+            while (val && dist < 2) {
+                ++dist;
+                val &= val - 1;
+            }
+            if (dist == 1)
+                set_link(i, j);
+        }
+}

 
 

-    xbt_dynar_free(&p0_args);
-    xbt_dynar_free(&p1_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_torus::generate()
+// {
+// }