Add torus topology.

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index f3de918962815d0c0822fc6aa9f42f7b1b767390..83935155dfce1308c380ab567eb80c929698c0a7 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -5,7 +5,6 @@
 #include <sstream>
 #include <msg/msg.h>
 #include <xbt/log.h>
 #include <sstream>
 #include <msg/msg.h>
 #include <xbt/log.h>

-#include "simgrid_features.h"

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


@@ -53,6 +52,7 @@ void communicator::listen()
 
 void communicator::send(const char* dest, message* msg)
 {
 
 void communicator::send(const char* dest, message* msg)
 {

+    DEBUG2("send %s to %s", msg->to_string().c_str(), dest);

     double msg_size = sizeof *msg;
     if (msg->get_type() == message::LOAD)
         msg_size += opt::comm_cost(msg->get_amount());
     double msg_size = sizeof *msg;
     if (msg->get_type() == message::LOAD)
         msg_size += opt::comm_cost(msg->get_amount());


@@ -105,6 +105,10 @@ bool communicator::recv(message*& msg, m_host_t& from, bool wait)
         }
     } while (restart);
 
         }
     } while (restart);
 

+    if (msg)
+        DEBUG2("received %s from %s",
+               msg->to_string().c_str(), MSG_host_get_name(from));
+

     return msg != NULL;
 }
 
     return msg != NULL;
 }