X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..52c07f4b6c9ba2b0af928b8e83c48f819e1c9fc0:/src/gras/Msg/rpc.c diff --git a/src/gras/Msg/rpc.c b/src/gras/Msg/rpc.c index 6375e3a590..53fffc3d57 100644 --- a/src/gras/Msg/rpc.c +++ b/src/gras/Msg/rpc.c @@ -25,8 +25,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_msg_rpc, gras_msg, "RPC mecanism"); */ void gras_msgtype_declare_rpc(const char *name, - gras_datadesc_type_t payload_request, - gras_datadesc_type_t payload_answer) + xbt_datadesc_type_t payload_request, + xbt_datadesc_type_t payload_answer) { gras_msgtype_declare_ext(name, 0, @@ -53,8 +53,8 @@ gras_msgtype_declare_rpc(const char *name, void gras_msgtype_declare_rpc_v(const char *name, short int version, - gras_datadesc_type_t payload_request, - gras_datadesc_type_t payload_answer) + xbt_datadesc_type_t payload_request, + xbt_datadesc_type_t payload_answer) { gras_msgtype_declare_ext(name, version, @@ -87,7 +87,7 @@ static int msgfilter_rpcID(gras_msg_t msg, void *ctx) xbt_dynar_foreach(_gras_rpc_cancelled, cursor, rpc_ctx) { if (msg->ID == rpc_ctx->ID && msg->kind == e_gras_msg_kind_rpcanswer) { XBT_VERB - ("Got an answer to the already canceled (timeouted?) RPC %ld. Ignore it (leaking the payload!).", + ("Got an answer to the already canceled (timeouted?) RPC %lu. Ignore it (leaking the payload!).", msg->ID); xbt_dynar_cursor_rm(_gras_rpc_cancelled, &cursor); return 1; @@ -104,11 +104,6 @@ void *gras_msg_ctx_mallocator_new_f(void) return xbt_new0(s_gras_msg_cb_ctx_t, 1); } -void gras_msg_ctx_mallocator_free_f(void *ctx) -{ - xbt_free(ctx); -} - void gras_msg_ctx_mallocator_reset_f(void *ctx) { memset(ctx, 0, sizeof(s_gras_msg_cb_ctx_t)); @@ -116,18 +111,18 @@ void gras_msg_ctx_mallocator_reset_f(void *ctx) /** @brief Launch a RPC call, but do not block for the answer */ gras_msg_cb_ctx_t -gras_msg_rpc_async_call_(gras_socket_t server, +gras_msg_rpc_async_call_(xbt_socket_t server, double timeOut, gras_msgtype_t msgtype, void *request) { gras_msg_cb_ctx_t ctx = xbt_mallocator_get(gras_msg_ctx_mallocator); if (msgtype->ctn_type) { - xbt_assert1(request, + xbt_assert(request, "RPC type '%s' convey a payload you must provide", msgtype->name); } else { - xbt_assert1(!request, + xbt_assert(!request, "No payload was declared for RPC type '%s'", msgtype->name); } @@ -138,8 +133,8 @@ gras_msg_rpc_async_call_(gras_socket_t server, ctx->timeout = timeOut; XBT_VERB("Send to %s:%d a RPC of type '%s' (ID=%lu)", - gras_socket_peer_name(server), - gras_socket_peer_port(server), msgtype->name, ctx->ID); + xbt_socket_peer_name(server), + xbt_socket_peer_port(server), msgtype->name, ctx->ID); gras_msg_send_ext(server, e_gras_msg_kind_rpccall, ctx->ID, msgtype, request); @@ -154,11 +149,11 @@ void gras_msg_rpc_async_wait(gras_msg_cb_ctx_t ctx, void *answer) s_gras_msg_t received; if (ctx->msgtype->answer_type) { - xbt_assert1(answer, + xbt_assert(answer, "Answers to RPC '%s' convey a payload you must accept", ctx->msgtype->name); } else { - xbt_assert1(!answer, + xbt_assert(!answer, "No payload was declared for answers to RPC '%s'", ctx->msgtype->name); } @@ -177,10 +172,10 @@ void gras_msg_rpc_async_wait(gras_msg_cb_ctx_t ctx, void *answer) _gras_rpc_cancelled = xbt_dynar_new(sizeof(ctx), NULL); xbt_dynar_push(_gras_rpc_cancelled, &ctx); XBT_INFO - ("canceled RPC %ld pushed onto the stack (%s from %s:%d) Reason: %s", + ("canceled RPC %lu pushed onto the stack (%s from %s:%d) Reason: %s", ctx->ID, ctx->msgtype->name, - gras_socket_peer_name(ctx->expeditor), - gras_socket_peer_port(ctx->expeditor), e.msg); + xbt_socket_peer_name(ctx->expeditor), + xbt_socket_peer_port(ctx->expeditor), e.msg); RETHROW; } @@ -190,7 +185,7 @@ void gras_msg_rpc_async_wait(gras_msg_cb_ctx_t ctx, void *answer) memcpy(&e, received.payl, received.payl_size); free(received.payl); XBT_VERB("Raise a remote exception cat:%d coming from %s (%s)", - e.category, e.host, e.msg); + (int)e.category, e.host, e.msg); __xbt_running_ctx_fetch()->exception.msg = e.msg; __xbt_running_ctx_fetch()->exception.category = e.category; __xbt_running_ctx_fetch()->exception.value = e.value; @@ -203,7 +198,7 @@ void gras_msg_rpc_async_wait(gras_msg_cb_ctx_t ctx, void *answer) __xbt_running_ctx_fetch()->exception.func = e.func; __xbt_running_ctx_fetch()->exception.used = e.used; __xbt_running_ctx_fetch()->exception.bt_strings = e.bt_strings; - memset(&__xbt_running_ctx_fetch()->exception.bt, 0, + memset((void*)&__xbt_running_ctx_fetch()->exception.bt, 0, sizeof(__xbt_running_ctx_fetch()->exception.bt)); DO_THROW(__xbt_running_ctx_fetch()); } @@ -212,7 +207,7 @@ void gras_msg_rpc_async_wait(gras_msg_cb_ctx_t ctx, void *answer) } /** @brief Conduct a RPC call */ -void gras_msg_rpccall_(gras_socket_t server, +void gras_msg_rpccall_(xbt_socket_t server, double timeout, gras_msgtype_t msgtype, void *request, void *answer) { @@ -233,13 +228,13 @@ void gras_msg_rpccall_(gras_socket_t server, void gras_msg_rpcreturn(double timeOut, gras_msg_cb_ctx_t ctx, void *answer) { - xbt_assert0(ctx->answer_due, + xbt_assert(ctx->answer_due, "RPC return not allowed here. Either not a RPC message or already returned a result"); ctx->answer_due = 0; XBT_DEBUG("Return to RPC '%s' from %s:%d (tOut=%f, payl=%p)", ctx->msgtype->name, - gras_socket_peer_name(ctx->expeditor), - gras_socket_peer_port(ctx->expeditor), timeOut, answer); + xbt_socket_peer_name(ctx->expeditor), + xbt_socket_peer_port(ctx->expeditor), timeOut, answer); gras_msg_send_ext(ctx->expeditor, e_gras_msg_kind_rpcanswer, ctx->ID, ctx->msgtype, answer); }