Simplify Channel::receive by handling non-blocking recv separately

[simgrid.git] / src / mc / remote / Channel.cpp

diff --git a/src/mc/remote/Channel.cpp b/src/mc/remote/Channel.cpp
index 556c9b5..57f8942 100644 (file)
--- a/src/mc/remote/Channel.cpp
+++ b/src/mc/remote/Channel.cpp
@@ -34,22 +34,22 @@ int Channel::send(const void* message, size_t size) const
   }
 
   if (is_valid_MessageType(*static_cast<const int*>(message))) {
-    XBT_DEBUG("Sending %s (%lu bytes sent)", to_c_str(*static_cast<const MessageType*>(message)), size);
+    XBT_DEBUG("Sending %s (%zu bytes sent)", to_c_str(*static_cast<const MessageType*>(message)), size);
   } else {
-    XBT_DEBUG("Sending bytes directly (from address %p) (%lu bytes sent)", message, size);
+    XBT_DEBUG("Sending bytes directly (from address %p) (%zu bytes sent)", message, size);
   }
 
   return 0;
 }
 
-ssize_t Channel::receive(void* message, size_t size, bool block) const
+ssize_t Channel::receive(void* message, size_t size) const
 {
-  ssize_t res = recv(this->socket_, message, size, block ? 0 : MSG_DONTWAIT);
+  ssize_t res = recv(this->socket_, message, size, 0);
   if (res != -1) {
     if (is_valid_MessageType(*static_cast<int*>(message))) {
-      XBT_DEBUG("Receive %s (requested %lu; received %ld)", to_c_str(*static_cast<MessageType*>(message)), size, res);
+      XBT_DEBUG("Receive %s (requested %zu; received %zd)", to_c_str(*static_cast<MessageType*>(message)), size, res);
     } else {
-      XBT_DEBUG("Receive %ld bytes", res);
+      XBT_DEBUG("Receive %zd bytes", res);
     }
   } else {
     XBT_ERROR("Channel::receive failure: %s", strerror(errno));