#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"
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)
{
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));
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));
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));
*
* @param timeout: How long should we wait for this message.
* @param msgt_want: type of awaited msg
- * @param[out] expeditor: where to create a socket to answer the incomming message
- * @param[out] payload: where to write the payload of the incomming message
+ * @param[out] expeditor: where to create a socket to answer the incoming message
+ * @param[out] payload: where to write the payload of the incoming message
* @return the error code (or no_error).
*
* Every message of another type received before the one waited will be queued
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;
* @param msgt_want: a dynar containing all accepted message type
* @param[out] ctx: the context of received message (in case it's a RPC call we want to answer to)
* @param[out] msgt_got: indice in the dynar of the type of the received message
- * @param[out] payload: where to write the payload of the incomming message
+ * @param[out] payload: where to write the payload of the incoming message
* @return the error code (or no_error).
*
* Every message of a type not in the accepted list received before the one
/** \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)
{
} while (period - now + begin > 0);
}
-/** @brief Handle an incomming message or timer (or wait up to \a timeOut seconds)
+/** @brief Handle an incoming message or timer (or wait up to \a timeOut seconds)
*
* @param timeOut: How long to wait for incoming messages (in seconds)
* @return the error code (or no_error).
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 */
}
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 incoming msg '%s' (payload_size=%d)",
cpt + 1, cb, msg.type->name, msg.payl_size);
if (!cb(&ctx, msg.payl)) {
/* cb handled the message */
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,
- 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,
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);
}
}
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)",
- 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
- ("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)",
- 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
- ("FIXME: gras_datadesc_free not implemented => leaking the payload");
+ ("FIXME: xbt_datadesc_free not implemented => leaking the payload");
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);
}
}