A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Type consistency.
[simgrid.git]
/
src
/
mc
/
remote
/
Channel.cpp
diff --git
a/src/mc/remote/Channel.cpp
b/src/mc/remote/Channel.cpp
index
7594e5e
..
6eaf30d
100644
(file)
--- a/
src/mc/remote/Channel.cpp
+++ b/
src/mc/remote/Channel.cpp
@@
-4,16
+4,14
@@
/* 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. */
/* 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 "src/mc/remote/Channel.hpp"
+#include <xbt/log.h>
+
#include <cerrno>
#include <unistd.h>
#include <cerrno>
#include <unistd.h>
-
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/types.h>
-#include <xbt/log.h>
-
-#include "src/mc/remote/Channel.hpp"
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Channel, mc, "MC interprocess communication");
namespace simgrid {
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Channel, mc, "MC interprocess communication");
namespace simgrid {
@@
-38,7
+36,7
@@
int Channel::send(const void* message, size_t size) const
ssize_t Channel::receive(void* message, size_t size, bool block) const
{
ssize_t Channel::receive(void* message, size_t size, bool block) const
{
-
in
t 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));
return res;
if (res != -1)
XBT_DEBUG("Receive %s", MC_message_type_name(*(e_mc_message_type*)message));
return res;