X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f195dd910f958191b3aa6e34414e43379fd7a567..58a5fef8735699a10762fe2bb8f1f938fba4b651:/src/gras/Msg/rpc.c

diff --git a/src/gras/Msg/rpc.c b/src/gras/Msg/rpc.c
index 1cef669309..79a0d12edc 100644
--- a/src/gras/Msg/rpc.c
+++ b/src/gras/Msg/rpc.c
@@ -9,11 +9,9 @@
 
 #include "gras/Msg/msg_private.h"
                 
-//XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_rpc,gras_msg,"RPCing");
-
 xbt_set_t _gras_rpctype_set = NULL;
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_rpc,gras_msg,"RPC mecanism");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_msg_rpc,gras_msg,"RPC mecanism");
 
 
 /** @brief declare a new versionned RPC type of the given name and payloads
@@ -76,40 +74,97 @@ static int msgfilter_rpcID(gras_msg_t msg, void* ctx) {
   return res;
 }
 
-/** @brief Conduct a RPC call
- *
- */
-void gras_msg_rpccall(gras_socket_t server,
-		      double timeOut,
-		      gras_msgtype_t msgtype,
-		      void *request, void *answer) {
+/** @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,
+			double timeOut,
+			gras_msgtype_t msgtype,
+			void *request) {
+  gras_msg_cb_ctx_t ctx = xbt_new0(s_gras_msg_cb_ctx_t,1);
+
+  if (msgtype->ctn_type) {
+    xbt_assert1(request,
+		"RPC type '%s' convey a payload you must provide",
+		msgtype->name);
+  } else {
+    xbt_assert1(!request,
+		"No payload was declared for RPC type '%s'",
+		msgtype->name);
+  }
+
+  ctx->ID = last_msg_ID++;
+  ctx->expeditor = server;
+  ctx->msgtype=msgtype;
+  ctx->timeout=timeOut;
+
+  VERB5("Send to %s:%d a RPC of type '%s' (ID=%lu) (exception%s caught)",
+	gras_socket_peer_name(server),
+	gras_socket_peer_port(server),
+	msgtype->name,ctx->ID,
+	(__xbt_ex_ctx()->ctx_caught?"":" not"));
 
-  unsigned long int msg_ID = last_msg_ID++;
+  gras_msg_send_ext(server, e_gras_msg_kind_rpccall, ctx->ID, msgtype, request);
+
+  return ctx;
+}
+
+/** @brief Wait teh answer of a RPC call previously launched asynchronously */
+void gras_msg_rpc_async_wait(gras_msg_cb_ctx_t ctx,
+			     void *answer) {
   s_gras_msg_t received;
 
-  DEBUG4("Send to %s:%d a RPC of type '%s' (ID=%lu)",
-	 gras_socket_peer_name(server),
-	 gras_socket_peer_port(server),
-	 msgtype->name,msg_ID);
+  if (ctx->msgtype->answer_type) {
+    xbt_assert1(answer,
+		"Answers to RPC '%s' convey a payload you must accept",
+		ctx->msgtype->name);
+  } else {
+    xbt_assert1(!answer,
+		"No payload was declared for answers to RPC '%s'",
+		ctx->msgtype->name);
+  }
 
-  gras_msg_send_ext(server, e_gras_msg_kind_rpccall, msg_ID, msgtype, request);
-  gras_msg_wait_ext(timeOut,
-		    msgtype, NULL, msgfilter_rpcID, &msg_ID,
+  gras_msg_wait_ext(ctx->timeout,
+		    ctx->msgtype, NULL, msgfilter_rpcID, &ctx->ID,
 		    &received);
+  free(ctx);
   if (received.kind == e_gras_msg_kind_rpcerror) {
-    /* Damn. Got an exception. Extract it and revive it */
     xbt_ex_t e;
-    VERB0("Raise a remote exception");
     memcpy(&e,received.payl,received.payl_size);
     free(received.payl);
-    memcpy((void*)&(__xbt_ex_ctx()->ctx_ex),&e,sizeof(xbt_ex_t));
+    VERB3("Raise a remote exception cat:%d comming from %s (%s)",
+	  e.category, e.host, e.msg);
+     __xbt_ex_ctx()->ctx_ex.msg      = e.msg;
+     __xbt_ex_ctx()->ctx_ex.category = e.category;
+     __xbt_ex_ctx()->ctx_ex.value    = e.value;
+     __xbt_ex_ctx()->ctx_ex.remote   = 1;
+     __xbt_ex_ctx()->ctx_ex.host     = e.host;
+     __xbt_ex_ctx()->ctx_ex.procname = e.procname;
+     __xbt_ex_ctx()->ctx_ex.pid      = e.pid;
+     __xbt_ex_ctx()->ctx_ex.file     = e.file;
+     __xbt_ex_ctx()->ctx_ex.line     = e.line;
+     __xbt_ex_ctx()->ctx_ex.func     = e.func;
+     __xbt_ex_ctx()->ctx_ex.used     = e.used;
+     __xbt_ex_ctx()->ctx_ex.bt_strings = e.bt_strings;
+     memset(&__xbt_ex_ctx()->ctx_ex.bt,0,
+	    sizeof(__xbt_ex_ctx()->ctx_ex.bt));
     DO_THROW(__xbt_ex_ctx()->ctx_ex);
-
   }
   memcpy(answer,received.payl,received.payl_size);
   free(received.payl);
 }
 
+/** @brief Conduct a RPC call */
+void gras_msg_rpccall(gras_socket_t server,
+		      double timeout,
+		      gras_msgtype_t msgtype,
+		      void *request, void *answer) {
+
+  gras_msg_cb_ctx_t ctx;
+
+  ctx= gras_msg_rpc_async_call(server, timeout,msgtype,request);
+  gras_msg_rpc_async_wait(ctx, answer);
+}
+
 
 /** @brief Return the result of a RPC call
  *
@@ -118,6 +173,7 @@ void gras_msg_rpccall(gras_socket_t server,
  */
 
 void gras_msg_rpcreturn(double timeOut,gras_msg_cb_ctx_t ctx,void *answer) {
-  gras_msg_send_ext(ctx->expeditor, e_gras_msg_kind_rpcanswer, ctx->ID, ctx->msgtype, answer);
+  gras_msg_send_ext(ctx->expeditor, e_gras_msg_kind_rpcanswer, 
+		    ctx->ID, ctx->msgtype, answer);
 }