X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8ba0bc2f48c6b9b96dfedd8fd383b941d5fdd0b..272ccad1b68b6d9c17069f3c934886925bb15b5d:/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 993ae1ebe2..34915867ef 100644 --- a/src/gras/Msg/gras_msg_exchange.c +++ b/src/gras/Msg/gras_msg_exchange.c @@ -136,8 +136,8 @@ gras_msg_wait_ext_(double timeout, * * @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 @@ -188,7 +188,7 @@ static int gras_msg_wait_or_filter(gras_msg_t msg, void *ctx) * @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 @@ -282,7 +282,7 @@ void gras_msg_handleall(double period) } 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). @@ -402,7 +402,7 @@ void gras_msg_handle(volatile double timeOut) 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 */ @@ -427,7 +427,7 @@ void gras_msg_handle(volatile double timeOut) 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, xbt_socket_peer_name(msg.expe), @@ -442,7 +442,7 @@ void gras_msg_handle(volatile double timeOut) 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); } } @@ -481,7 +481,7 @@ void gras_msg_handle(volatile double timeOut) 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); } }