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
reduce the amount of output on (handled) issues
[simgrid.git]
/
src
/
gras
/
Msg
/
gras_msg_exchange.c
diff --git
a/src/gras/Msg/gras_msg_exchange.c
b/src/gras/Msg/gras_msg_exchange.c
index
a992a81
..
df02431
100644
(file)
--- a/
src/gras/Msg/gras_msg_exchange.c
+++ b/
src/gras/Msg/gras_msg_exchange.c
@@
-8,6
+8,7
@@
#include "xbt/ex.h"
#include "xbt/ex_interface.h"
#include "xbt/ex.h"
#include "xbt/ex_interface.h"
+#include "xbt/socket.h"
#include "gras/Msg/msg_private.h"
#include "gras/Virtu/virtu_interface.h"
#include "gras/Msg/msg_private.h"
#include "gras/Virtu/virtu_interface.h"
@@
-35,7
+36,7
@@
const char *e_gras_msg_kind_names[e_gras_msg_kind_count] =
void
gras_msg_wait_ext_(double timeout,
gras_msgtype_t msgt_want,
void
gras_msg_wait_ext_(double timeout,
gras_msgtype_t msgt_want,
-
gras
_socket_t expe_want,
+
xbt
_socket_t expe_want,
gras_msg_filter_t filter,
void *filter_ctx, gras_msg_t msg_got)
{
gras_msg_filter_t filter,
void *filter_ctx, gras_msg_t msg_got)
{
@@
-54,8
+55,8
@@
gras_msg_wait_ext_(double timeout,
xbt_dynar_foreach(pd->msg_waitqueue, cpt, msg) {
if ((!msgt_want || (msg.type->code == msgt_want->code))
xbt_dynar_foreach(pd->msg_waitqueue, cpt, msg) {
if ((!msgt_want || (msg.type->code == msgt_want->code))
- && (!expe_want || (!strcmp(
gras
_socket_peer_name(msg.expe),
-
gras
_socket_peer_name(expe_want))))
+ && (!expe_want || (!strcmp(
xbt
_socket_peer_name(msg.expe),
+
xbt
_socket_peer_name(expe_want))))
&& (!filter || filter(&msg, filter_ctx))) {
memcpy(msg_got, &msg, sizeof(s_gras_msg_t));
&& (!filter || filter(&msg, filter_ctx))) {
memcpy(msg_got, &msg, sizeof(s_gras_msg_t));
@@
-67,8
+68,8
@@
gras_msg_wait_ext_(double timeout,
xbt_dynar_foreach(pd->msg_queue, cpt, msg) {
if ((!msgt_want || (msg.type->code == msgt_want->code))
xbt_dynar_foreach(pd->msg_queue, cpt, msg) {
if ((!msgt_want || (msg.type->code == msgt_want->code))
- && (!expe_want || (!strcmp(
gras
_socket_peer_name(msg.expe),
-
gras
_socket_peer_name(expe_want))))
+ && (!expe_want || (!strcmp(
xbt
_socket_peer_name(msg.expe),
+
xbt
_socket_peer_name(expe_want))))
&& (!filter || filter(&msg, filter_ctx))) {
memcpy(msg_got, &msg, sizeof(s_gras_msg_t));
&& (!filter || filter(&msg, filter_ctx))) {
memcpy(msg_got, &msg, sizeof(s_gras_msg_t));
@@
-107,8
+108,8
@@
gras_msg_wait_ext_(double timeout,
XBT_DEBUG("Got a message from the socket");
if ((!msgt_want || (msg.type->code == msgt_want->code))
XBT_DEBUG("Got a message from the socket");
if ((!msgt_want || (msg.type->code == msgt_want->code))
- && (!expe_want || (!strcmp(
gras
_socket_peer_name(msg.expe),
-
gras
_socket_peer_name(expe_want))))
+ && (!expe_want || (!strcmp(
xbt
_socket_peer_name(msg.expe),
+
xbt
_socket_peer_name(expe_want))))
&& (!filter || filter(&msg, filter_ctx))) {
memcpy(msg_got, &msg, sizeof(s_gras_msg_t));
&& (!filter || filter(&msg, filter_ctx))) {
memcpy(msg_got, &msg, sizeof(s_gras_msg_t));
@@
-145,7
+146,7
@@
gras_msg_wait_ext_(double timeout,
void
gras_msg_wait_(double timeout,
gras_msgtype_t msgt_want,
void
gras_msg_wait_(double timeout,
gras_msgtype_t msgt_want,
-
gras
_socket_t * expeditor, void *payload)
+
xbt
_socket_t * expeditor, void *payload)
{
s_gras_msg_t msg;
{
s_gras_msg_t msg;
@@
-230,7
+231,7
@@
void gras_msg_wait_or(double timeout,
/** \brief Send the data pointed by \a payload as a message of type
* \a msgtype to the peer \a sock */
/** \brief Send the data pointed by \a payload as a message of type
* \a msgtype to the peer \a sock */
-void gras_msg_send_(
gras
_socket_t sock, gras_msgtype_t msgtype,
+void gras_msg_send_(
xbt
_socket_t sock, gras_msgtype_t msgtype,
void *payload)
{
void *payload)
{
@@
-326,7
+327,7
@@
void gras_msg_handle(volatile double timeOut)
/* get a message (from the queue or from the net) */
timeouted = 0;
/* get a message (from the queue or from the net) */
timeouted = 0;
- if (
xbt_dynar_length
(pd->msg_queue)) {
+ if (
!xbt_dynar_is_empty
(pd->msg_queue)) {
XBT_DEBUG("Get a message from the queue");
xbt_dynar_shift(pd->msg_queue, &msg);
} else {
XBT_DEBUG("Get a message from the queue");
xbt_dynar_shift(pd->msg_queue, &msg);
} else {
@@
-382,7
+383,7
@@
void gras_msg_handle(volatile double timeOut)
XBT_INFO
("No callback for message '%s' (type:%s) from %s:%d. Queue it for later gras_msg_wait() use.",
msg.type->name, e_gras_msg_kind_names[msg.kind],
XBT_INFO
("No callback for message '%s' (type:%s) from %s:%d. Queue it for later gras_msg_wait() use.",
msg.type->name, e_gras_msg_kind_names[msg.kind],
-
gras_socket_peer_name(msg.expe), gras
_socket_peer_port(msg.expe));
+
xbt_socket_peer_name(msg.expe), xbt
_socket_peer_port(msg.expe));
xbt_dynar_push(pd->msg_waitqueue, &msg);
return; /* FIXME: maybe we should call ourselves again until the end of the timer or a proper msg is got */
}
xbt_dynar_push(pd->msg_waitqueue, &msg);
return; /* FIXME: maybe we should call ourselves again until the end of the timer or a proper msg is got */
}
@@
-401,9
+402,9
@@
void gras_msg_handle(volatile double timeOut)
volatile unsigned int cpt2 = cpt;
if (!ran_ok) {
XBT_DEBUG
volatile unsigned int cpt2 = cpt;
if (!ran_ok) {
XBT_DEBUG
- ("Use the callback #%
d
(@%p) for incomming msg '%s' (payload_size=%d)",
+ ("Use the callback #%
u
(@%p) for incomming msg '%s' (payload_size=%d)",
cpt + 1, cb, msg.type->name, msg.payl_size);
cpt + 1, cb, msg.type->name, msg.payl_size);
- if (!
(*cb)
(&ctx, msg.payl)) {
+ if (!
cb
(&ctx, msg.payl)) {
/* cb handled the message */
free(msg.payl);
ran_ok = 1;
/* cb handled the message */
free(msg.payl);
ran_ok = 1;
@@
-426,11
+427,11
@@
void gras_msg_handle(volatile double timeOut)
e.host = (char *) gras_os_myname();
xbt_ex_setup_backtrace(&e);
}
e.host = (char *) gras_os_myname();
xbt_ex_setup_backtrace(&e);
}
- XBT_
INFO
+ XBT_
VERB
("Propagate %s exception ('%s') from '%s' RPC cb back to %s:%d",
(e.remote ? "remote" : "local"), e.msg, msg.type->name,
("Propagate %s exception ('%s') from '%s' RPC cb back to %s:%d",
(e.remote ? "remote" : "local"), e.msg, msg.type->name,
-
gras
_socket_peer_name(msg.expe),
-
gras
_socket_peer_port(msg.expe));
+
xbt
_socket_peer_name(msg.expe),
+
xbt
_socket_peer_port(msg.expe));
if (XBT_LOG_ISENABLED(gras_msg, xbt_log_priority_verbose))
xbt_ex_display(&e);
gras_msg_send_ext(msg.expe, e_gras_msg_kind_rpcerror,
if (XBT_LOG_ISENABLED(gras_msg, xbt_log_priority_verbose))
xbt_ex_display(&e);
gras_msg_send_ext(msg.expe, e_gras_msg_kind_rpcerror,
@@
-441,7
+442,7
@@
void gras_msg_handle(volatile double timeOut)
ran_ok = 1;
} else {
RETHROWF
ran_ok = 1;
} else {
RETHROWF
- ("Callback #%
d
(@%p) to message '%s' (payload size: %d) raised an exception: %s",
+ ("Callback #%
u
(@%p) to message '%s' (payload size: %d) raised an exception: %s",
cpt + 1, cb, msg.type->name, msg.payl_size);
}
}
cpt + 1, cb, msg.type->name, msg.payl_size);
}
}
@@
-458,29
+459,29
@@
void gras_msg_handle(volatile double timeOut)
THROWF(mismatch_error, 0,
"Message '%s' refused by all registered callbacks (maybe your callback misses a 'return 0' at the end)",
msg.type->name);
THROWF(mismatch_error, 0,
"Message '%s' refused by all registered callbacks (maybe your callback misses a 'return 0' at the end)",
msg.type->name);
- /* FIXME:
gras
_datadesc_free not implemented => leaking the payload */
+ /* FIXME:
xbt
_datadesc_free not implemented => leaking the payload */
break;
case e_gras_msg_kind_rpcanswer:
XBT_INFO("Unexpected RPC answer discarded (type: %s; from:%s:%d)",
break;
case e_gras_msg_kind_rpcanswer:
XBT_INFO("Unexpected RPC answer discarded (type: %s; from:%s:%d)",
- msg.type->name,
gras
_socket_peer_name(msg.expe),
-
gras
_socket_peer_port(msg.expe));
+ msg.type->name,
xbt
_socket_peer_name(msg.expe),
+
xbt
_socket_peer_port(msg.expe));
XBT_WARN
XBT_WARN
- ("FIXME:
gras
_datadesc_free not implemented => leaking the payload");
+ ("FIXME:
xbt
_datadesc_free not implemented => leaking the payload");
return;
case e_gras_msg_kind_rpcerror:
XBT_INFO("Unexpected RPC error discarded (type: %s; from:%s:%d)",
return;
case e_gras_msg_kind_rpcerror:
XBT_INFO("Unexpected RPC error discarded (type: %s; from:%s:%d)",
- msg.type->name,
gras
_socket_peer_name(msg.expe),
-
gras
_socket_peer_port(msg.expe));
+ msg.type->name,
xbt
_socket_peer_name(msg.expe),
+
xbt
_socket_peer_port(msg.expe));
XBT_WARN
XBT_WARN
- ("FIXME:
gras
_datadesc_free not implemented => leaking the payload");
+ ("FIXME:
xbt
_datadesc_free not implemented => leaking the payload");
return;
default:
THROWF(unknown_error, 0,
return;
default:
THROWF(unknown_error, 0,
- "Cannot handle messages of kind %d yet", msg.type->kind);
+ "Cannot handle messages of kind %d yet",
(int)
msg.type->kind);
}
}
}
}