Deadlock fix, and other changes.

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index e6653ebda4e9acf52d0c5a40acd8e8c4f09f1d61..1570b10148a02dbb2fdfa7a78444d2cae1309b6a 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,14 +1,15 @@
-#include "communicator.h"
-
 #include <algorithm>
 #include <tr1/functional>
 #include <sstream>
 #include <msg/msg.h>
 #include <xbt/log.h>
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
+
 #include "misc.h"
 #include "options.h"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
+#include "communicator.h"
 
 std::string message::to_string()
 {
@@ -19,7 +20,7 @@ std::string message::to_string()
     return oss.str();
 }
 
-const int communicator::send_count_before_flush = 16;
+const int communicator::send_count_before_flush = 4;
 
 communicator::communicator()
     : host((hostdata* )MSG_host_get_data(MSG_host_self()))