X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ab1b8d93ffc4298887caa903a51a9a5e6264d46..5ce5e2ee7fd0dd8344be0823d7bd7c4abb16b284:/src/gras/Msg/msg.c

diff --git a/src/gras/Msg/msg.c b/src/gras/Msg/msg.c
index e4edd089d5..a041dba75b 100644
--- a/src/gras/Msg/msg.c
+++ b/src/gras/Msg/msg.c
@@ -79,6 +79,12 @@ void gras_msg_init(void) {
   memcpy(_GRAS_header,"GRAS", 4);
   _GRAS_header[4]=GRAS_PROTOCOL_VERSION;
   _GRAS_header[5]=(char)GRAS_THISARCH;
+   
+  gras_msg_ctx_mallocator = 
+     xbt_mallocator_new(1000,
+			gras_msg_ctx_mallocator_new_f,
+			gras_msg_ctx_mallocator_free_f,
+			gras_msg_ctx_mallocator_reset_f);
 }
 
 /*
@@ -88,6 +94,8 @@ void
 gras_msg_exit(void) {
   VERB0("Exiting Msg");
   xbt_set_free(&_gras_msgtype_set);
+
+  xbt_mallocator_free(gras_msg_ctx_mallocator);
 }
 
 /*
@@ -100,6 +108,23 @@ void gras_msgtype_free(void *t) {
     free(msgtype);
   }
 }
+/**
+ * Dump all declared message types (debugging purpose)
+ */
+void gras_msgtype_dumpall(void) {   
+  xbt_set_cursor_t cursor;
+  gras_msgtype_t msgtype=NULL;
+   
+  INFO0("Dump of all registered messages:");
+  xbt_set_foreach(_gras_msgtype_set, cursor, msgtype) {
+    INFO6("  Message name: %s (v%d) %s; %s%s%s", 
+	  msgtype->name, msgtype->version, e_gras_msg_kind_names[msgtype->kind],
+	  gras_datadesc_get_name(msgtype->ctn_type),
+	  (msgtype->kind==e_gras_msg_kind_rpccall ? " -> ":""),
+	  (msgtype->kind==e_gras_msg_kind_rpccall ? gras_datadesc_get_name(msgtype->answer_type) : ""));
+  }   
+}
+
 
 /**
  * make_namev:
@@ -214,24 +239,41 @@ gras_msgtype_declare_v(const char           *name,
 			    e_gras_msg_kind_oneway, payload, NULL);
 }
 
-/** @brief retrieve an existing message type from its name. */
+/** @brief retrieve an existing message type from its name (raises an exception if it does not exist). */
 gras_msgtype_t gras_msgtype_by_name (const char *name) {
   return gras_msgtype_by_namev(name,0);
 }
+/** @brief retrieve an existing message type from its name (or NULL if it does not exist). */
+gras_msgtype_t gras_msgtype_by_name_or_null (const char *name) {
+  xbt_ex_t e;
+  gras_msgtype_t res = NULL;
+   
+  TRY {
+     res = gras_msgtype_by_namev(name,0);
+  } CATCH(e) {
+     res = NULL;
+     xbt_ex_free(e);
+  }
+  return res;
+}
 
 /** @brief retrieve an existing message type from its name and version. */
 gras_msgtype_t gras_msgtype_by_namev(const char      *name,
 				     short int        version) {
   gras_msgtype_t res = NULL;
-  char *namev = make_namev(name,version); 
+  char *namev = make_namev(name,version);
+  volatile int found=0;
   xbt_ex_t e;
 
   TRY {
     res = (gras_msgtype_t)xbt_set_get_by_name(_gras_msgtype_set, namev);
+    found=1;
   } CATCH(e) {
     xbt_ex_free(e);
-    THROW1(not_found_error,0,"No registred message of that name: %s",name);
   }
+  if (!found)
+    THROW1(not_found_error,0,"No registred message of that name: %s",name);
+
   if (name != namev) 
     free(namev);
   
@@ -429,7 +471,8 @@ void gras_msg_wait_or(double         timeout,
   }
 
   if (ctx) 
-    *ctx=gras_msg_cb_ctx_new(msg.expe,msg.type,msg.ID,60);
+    *ctx=gras_msg_cb_ctx_new(msg.expe, msg.type, msg.ID,
+			     (msg.kind == e_gras_msg_kind_rpccall), 60);
 
   if (msgt_got)
     *msgt_got = xbt_dynar_search(msgt_want,msg.type);
@@ -500,7 +543,8 @@ gras_msg_handle(double timeOut) {
   
   double          untiltimer;
    
-  int             cpt, ran_ok;
+  int             cpt;
+  int volatile ran_ok;
 
   s_gras_msg_t    msg;
 
@@ -602,6 +646,7 @@ gras_msg_handle(double timeOut) {
   ctx.expeditor = msg.expe;
   ctx.ID = msg.ID;
   ctx.msgtype = msg.type;
+  ctx.answer_due = (msg.kind == e_gras_msg_kind_rpccall);
 
   switch (msg.kind) {
   case e_gras_msg_kind_oneway:
@@ -636,11 +681,15 @@ gras_msg_handle(double timeOut) {
 	gras_msg_send_ext(msg.expe, e_gras_msg_kind_rpcerror,
 			  msg.ID, msg.type, &e);
 	xbt_ex_free(e);
+	ctx.answer_due = 0;
 	ran_ok=1;
       } else {
 	RETHROW0("Callback raised an exception: %s");
       }
     }
+    xbt_assert0(!(ctx.answer_due),
+		"RPC callback didn't call gras_msg_rpcreturn");
+
     if (!ran_ok)
       THROW1(mismatch_error,0,
 	     "Message '%s' refused by all registered callbacks", msg.type->name);
@@ -751,12 +800,15 @@ gras_socket_t gras_msg_cb_ctx_from(gras_msg_cb_ctx_t ctx) {
 gras_msg_cb_ctx_t gras_msg_cb_ctx_new(gras_socket_t expe, 
 				      gras_msgtype_t msgtype,
 				      unsigned long int ID,
+				      int answer_due,
 				      double timeout) {
   gras_msg_cb_ctx_t res=xbt_new(s_gras_msg_cb_ctx_t,1);
   res->expeditor = expe;
   res->msgtype = msgtype;
   res->ID = ID;
   res->timeout = timeout;
+  res->answer_due = answer_due;
+
   return res;
 }
 /* \brief Frees a message exchange context