Do not use MSG_comm_test() after MSG_comm_waitany().

[loba.git] / deployment.cpp

diff --git a/deployment.cpp b/deployment.cpp
index 43505db780c6b35e22f8aa3ccba5170fd285441a..fa9e73105897ebe2262c9f0c64eca66d0619e466 100644 (file)
--- 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>
 #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 "hostdata.h"

+#include "misc.h"

 #include "options.h"
 
 #include "options.h"
 

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

 
 void MY_launch_application()
 {
 
 void MY_launch_application()
 {


@@ -43,22 +45,21 @@ void deployment_generator::set_link(int host1, int host2)
 
 void deployment_generator::deploy()
 {
 
 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();
     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();
         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);
         }
             xbt_dynar_push_as(args, const char*, neighbor_name);
         }

-        MSG_set_function(hostname, func, args);
+        MSG_set_function(hostname, "loba", args);

         xbt_dynar_reset(args);
     }
     xbt_dynar_free(&args);
         xbt_dynar_reset(args);
     }
     xbt_dynar_free(&args);


@@ -137,10 +138,9 @@ void deployment_torus::generate()
     // here width == ceil(sqrt(size))
 
     unsigned first_on_last_line = (size() - 1) - (size() - 1) % width;
     // 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 )size(), width,
-           (unsigned )(size() / width + !!(size() % width)),
-           first_on_last_line);
+    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;
     for (unsigned i = 0; i < size(); i++) {
         unsigned next_line;
         unsigned prev_line;