sed -i -e 's/\t/ /g' *.[ch] Please people, stop using tabs in your source

[simgrid.git] / src / gras / Msg / rpc.c

diff --git a/src/gras/Msg/rpc.c b/src/gras/Msg/rpc.c
index 8c7e72c..53fffc3 100644 (file)
--- 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,7 +111,7 @@ 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)
 {
@@ -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);
@@ -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)
 {
@@ -238,8 +233,8 @@ void gras_msg_rpcreturn(double timeOut, gras_msg_cb_ctx_t ctx,
   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);
 }