X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dbef7c255d1e1bebb88d6986817557648289aec8..d89ca681772fdaafdd69049d4d66676a4e98de38:/src/mc/remote/Channel.cpp

diff --git a/src/mc/remote/Channel.cpp b/src/mc/remote/Channel.cpp
index 6c4000dae3..43ace95034 100644
--- a/src/mc/remote/Channel.cpp
+++ b/src/mc/remote/Channel.cpp
@@ -1,18 +1,17 @@
-/* Copyright (c) 2015-2016. The SimGrid Team.
+/* Copyright (c) 2015-2022. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <errno.h>
-#include <unistd.h>
+#include "src/mc/remote/Channel.hpp"
+#include <xbt/log.h>
 
+#include <cerrno>
+#include <cstring>
 #include <sys/socket.h>
 #include <sys/types.h>
-
-#include <xbt/log.h>
-
-#include "src/mc/remote/Channel.hpp"
+#include <unistd.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Channel, mc, "MC interprocess communication");
 
@@ -28,20 +27,23 @@ Channel::~Channel()
 /** @brief Send a message; returns 0 on success or errno on failure */
 int Channel::send(const void* message, size_t size) const
 {
-  XBT_DEBUG("Send %s", MC_message_type_name(*(e_mc_message_type*)message));
-  while (::send(this->socket_, message, size, 0) == -1)
-    if (errno == EINTR)
-      continue;
-    else
+  XBT_DEBUG("Send %s", to_c_str(*(MessageType*)message));
+  while (::send(this->socket_, message, size, 0) == -1) {
+    if (errno != EINTR) {
+      XBT_ERROR("Channel::send failure: %s", strerror(errno));
       return errno;
+    }
+  }
   return 0;
 }
 
 ssize_t Channel::receive(void* message, size_t size, bool block) const
 {
-  int res = recv(this->socket_, message, size, block ? 0 : MSG_DONTWAIT);
+  ssize_t res = recv(this->socket_, message, size, block ? 0 : MSG_DONTWAIT);
   if (res != -1)
-    XBT_DEBUG("Receive %s", MC_message_type_name(*(e_mc_message_type*)message));
+    XBT_DEBUG("Receive %s", to_c_str(*(MessageType*)message));
+  else
+    XBT_ERROR("Channel::receive failure: %s", strerror(errno));
   return res;
 }
 }