/** @brief Send a message; returns 0 on success or errno on failure */
int Channel::send(const void* message, size_t size) const
{
+ if (size >= sizeof(int) && is_valid_MessageType(*static_cast<const int*>(message))) {
+ 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) (%zu bytes sent)", message, size);
+ if (size == 0)
+ XBT_WARN("Request to send a 0-sized message! Proceeding anyway.");
+ }
+
while (::send(this->socket_, message, size, 0) == -1) {
if (errno != EINTR) {
XBT_ERROR("Channel::send failure: %s", strerror(errno));
return errno;
}
}
-
- if (is_valid_MessageType(*(int*)message)) {
- XBT_DEBUG("Sending %s (%lu bytes sent)", to_c_str(*(MessageType*)message), size);
- } else {
- XBT_DEBUG("Sending bytes directly (from address %p) (%lu 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);
- if (res != -1) {
- if (is_valid_MessageType(*(int*)message)) {
- XBT_DEBUG("Receive %s (requested %lu; received %ld)", to_c_str(*(MessageType*)message), size, res);
- } else {
- XBT_DEBUG("Receive %ld bytes", res);
- }
+ ssize_t res = recv(this->socket_, message, size, 0);
+ xbt_assert(res != -1, "Channel::receive failure: %s", strerror(errno));
+ if (static_cast<size_t>(res) >= sizeof(int) && is_valid_MessageType(*static_cast<const int*>(message))) {
+ XBT_DEBUG("Receive %s (requested %zu; received %zd at %p)", to_c_str(*static_cast<const MessageType*>(message)),
+ size, res, message);
} else {
- XBT_ERROR("Channel::receive failure: %s", strerror(errno));
+ XBT_DEBUG("Receive %zd bytes", res);
}
return res;
}
