X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2995193b7e30d03c04917852c4c0b26d26646273..de746a537cd455c094792011d63ee309fc8d8711:/src/gras/Msg/msg.c?ds=sidebyside

diff --git a/src/gras/Msg/msg.c b/src/gras/Msg/msg.c
index dca2f9037a..c0a5e03721 100644
--- a/src/gras/Msg/msg.c
+++ b/src/gras/Msg/msg.c
@@ -125,7 +125,7 @@ void gras_msgtype_declare(const char           *name,
  * @param version: something like versionning symbol
  * @param payload: datadescription of the payload
  *
- * Registers a message to the GRAS mecanism. Use this version instead of 
+ * Registers a message to the GRAS mechanism. Use this version instead of 
  * gras_msgtype_declare when you change the semantic or syntax of a message and
  * want your programs to be able to deal with both versions. Internally, each
  * will be handled as an independent message type, so you can register 
@@ -139,7 +139,10 @@ gras_msgtype_declare_v(const char           *name,
   xbt_error_t   errcode;
   gras_msgtype_t msgtype;
   char *namev=make_namev(name,version);
-  
+   
+  if (!payload) 
+     WARN1("Message %s has NULL payload",name);
+   
   errcode = xbt_set_get_by_name(_gras_msgtype_set,
 				 namev,(xbt_set_elm_t*)&msgtype);
 
@@ -246,7 +249,7 @@ gras_msg_recv(gras_socket_t    sock,
   TRY(gras_trp_chunk_recv(sock, header, 6));
   for (cpt=0; cpt<4; cpt++)
     if (header[cpt] != GRAS_header[cpt])
-      RAISE0(mismatch_error,"Incoming bytes do not look like a GRAS message");
+      RAISE2(mismatch_error,"Incoming bytes do not look like a GRAS message (header='%.4s' not '%.4s')",header,GRAS_header);
   if (header[4] != GRAS_header[4]) 
     RAISE2(mismatch_error,"GRAS protocol mismatch (got %d, use %d)",
 	   (int)header[4], (int)GRAS_header[4]);
@@ -351,7 +354,7 @@ gras_msg_wait(double           timeout,
 
 /** @brief Handle an incomming message or timer (or wait up to \a timeOut seconds)
  *
- * @param timeOut: How long to wait for incoming messages
+ * @param timeOut: How long to wait for incoming messages (in seconds)
  * @return the error code (or no_error).
  *
  * Messages are passed to the callbacks.
@@ -371,43 +374,61 @@ gras_msg_handle(double timeOut) {
   gras_msgtype_t  msgtype;
 
   gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_get("gras_msg");
-  gras_cblist_t  *list;
+  gras_cblist_t  *list=NULL;
   gras_msg_cb_t       cb;
+   
+  int timerexpected;
 
   VERB1("Handling message within the next %.2fs",timeOut);
   
   untiltimer = gras_msg_timer_handle();
   DEBUG2("[%.0f] Next timer in %f sec", gras_os_time(), untiltimer);
   if (untiltimer == 0.0) {
-     /* A timer was already elapsed */
+     /* A timer was already elapsed and handled */
      return no_error;
   }
+  if (untiltimer != -1.0) {
+     timerexpected = 1;
+     timeOut = MIN(timeOut, untiltimer);
+  } else {
+     timerexpected = 0;
+  }
    
   /* get a message (from the queue or from the net) */
   if (xbt_dynar_length(pd->msg_queue)) {
+    DEBUG0("Get a message from the queue");
     xbt_dynar_shift(pd->msg_queue,&msg);
     expeditor = msg.expeditor;
     msgtype   = msg.type;
     payload   = msg.payload;
     errcode   = no_error;
   } else {
-    errcode = gras_trp_select(MIN(timeOut,untiltimer), &expeditor);
+    errcode = gras_trp_select(timeOut, &expeditor);
     if (errcode != no_error && errcode != timeout_error)
        return errcode;
     if (errcode != timeout_error)
        TRY(gras_msg_recv(expeditor, &msgtype, &payload, &payload_size));
   }
 
-  if (errcode == timeout_error && untiltimer < timeOut) {
-     /* A timer elapsed before the arrival of any message even if we select()ed a bit */
-     untiltimer = gras_msg_timer_handle();
-     if (untiltimer == 0.0) {
-	return no_error;
+  if (errcode == timeout_error ) {
+     if (timerexpected) {
+	  
+	/* A timer elapsed before the arrival of any message even if we select()ed a bit */
+	untiltimer = gras_msg_timer_handle();
+	if (untiltimer == 0.0) {
+	   return no_error;
+	} else {
+	   xbt_assert1(untiltimer>0, "Negative timer (%f). I'm puzzeled", untiltimer);
+	   ERROR1("No timer elapsed, in contrary to expectations (next in %f sec)",
+		  untiltimer);
+	   return timeout_error;
+	}
+	
      } else {
-	WARN1("Weird. I computed that a timer should elapse shortly, but none did (I still should wait %f sec)",
-	      untiltimer);
+	/* select timeouted, and no timer elapsed. Nothing to do */
 	return timeout_error;
      }
+     
   }
    
   /* A message was already there or arrived in the meanwhile. handle it */