Allow changing communicator::send_count_before_flush at run-time.

[loba.git] / deployment.cpp

diff --git a/deployment.cpp b/deployment.cpp
index d582dc66e6b5327b3544e7100276eec61ae1fe38..29de927fa45566845a2ea899e311b0674e210973 100644 (file)
--- a/deployment.cpp
+++ b/deployment.cpp
@@ -1,14 +1,15 @@
-#include "deployment.h"
-

 #include <iomanip>
 #include <sstream>
 #include <msg/msg.h>
 #include <xbt/dynar.h>
 #include <xbt/log.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 "options.h"
 
 #include "hostdata.h"
 #include "options.h"
 

-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(depl);
+#include "deployment.h"

 
 void MY_launch_application()
 {
 
 void MY_launch_application()
 {


@@ -43,7 +44,7 @@ void deployment_generator::set_link(int host1, int host2)
 
 void deployment_generator::deploy()
 {
 
 void deployment_generator::deploy()
 {

-    const char* func = "simulation_main";
+    const char* func = "loba";

     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();
     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();


@@ -134,6 +135,7 @@ void deployment_torus::generate()
             b = c;
     }
     unsigned width = b;
             b = c;
     }
     unsigned width = b;

+    // here width == ceil(sqrt(size))

 
     unsigned first_on_last_line = (size() - 1) - (size() - 1) % width;
     DEBUG4("torus size = %u ; width = %u ; height = %u ; foll = %u",
 
     unsigned first_on_last_line = (size() - 1) - (size() - 1) % width;
     DEBUG4("torus size = %u ; width = %u ; height = %u ; foll = %u",