In gras_msg_handle, do not discard messages without callback: they are probably messa...

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

diff --git a/src/gras/Msg/msg.c b/src/gras/Msg/msg.c
index 66867f6..d8b6dc9 100644 (file)
--- a/src/gras/Msg/msg.c
+++ b/src/gras/Msg/msg.c
@@ -35,9 +35,10 @@ static void *gras_msg_procdata_new() {
    
    res->name = xbt_strdup("gras_msg");
    res->name_len = 0;
-   res->msg_queue = xbt_dynar_new(sizeof(s_gras_msg_t),   NULL);
-   res->cbl_list  = xbt_dynar_new(sizeof(gras_cblist_t *),gras_cbl_free);
-   res->timers    = xbt_dynar_new(sizeof(s_gras_timer_t), NULL);
+   res->msg_queue     = xbt_dynar_new(sizeof(s_gras_msg_t),   NULL);
+   res->msg_waitqueue = xbt_dynar_new(sizeof(s_gras_msg_t),   NULL);
+   res->cbl_list      = xbt_dynar_new(sizeof(gras_cblist_t *),gras_cbl_free);
+   res->timers        = xbt_dynar_new(sizeof(s_gras_timer_t), NULL);
    
    return (void*)res;
 }
@@ -49,6 +50,7 @@ static void gras_msg_procdata_free(void *data) {
    gras_msg_procdata_t res = (gras_msg_procdata_t)data;
    
    xbt_dynar_free(&( res->msg_queue ));
+   xbt_dynar_free(&( res->msg_waitqueue ));
    xbt_dynar_free(&( res->cbl_list ));
    xbt_dynar_free(&( res->timers ));
 
@@ -79,6 +81,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 +96,8 @@ void
 gras_msg_exit(void) {
   VERB0("Exiting Msg");
   xbt_set_free(&_gras_msgtype_set);
+
+  xbt_mallocator_free(gras_msg_ctx_mallocator);
 }
 
 /*
@@ -309,6 +319,19 @@ gras_msg_wait_ext(double           timeout,
   start = gras_os_time();
   VERB1("Waiting for message '%s'",msgt_want?msgt_want->name:"(any)");
 
+  xbt_dynar_foreach(pd->msg_waitqueue,cpt,msg){
+    if ( (   !msgt_want || (msg.type->code == msgt_want->code)) 
+        && (!expe_want || (!strcmp( gras_socket_peer_name(msg.expe),
+                                    gras_socket_peer_name(expe_want))))
+        && (!filter || filter(&msg,filter_ctx))) {
+
+      memcpy(msg_got,&msg,sizeof(s_gras_msg_t));
+      xbt_dynar_cursor_rm(pd->msg_waitqueue, &cpt);
+      VERB0("The waited message was queued");
+      return;
+    }
+  }
+
   xbt_dynar_foreach(pd->msg_queue,cpt,msg){
     if ( (   !msgt_want || (msg.type->code == msgt_want->code)) 
         && (!expe_want || (!strcmp( gras_socket_peer_name(msg.expe),
@@ -463,7 +486,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);
@@ -627,11 +651,11 @@ gras_msg_handle(double timeOut) {
     }
   }
   if (!list) {
-    INFO3("No callback for the incomming '%s' message (from %s:%d). Discarded.", 
+    INFO3("No callback for message '%s' from %s:%d. Queue it for later gras_msg_wait() use.",
          msg.type->name,
          gras_socket_peer_name(msg.expe),gras_socket_peer_port(msg.expe));
-    WARN0("FIXME: gras_datadesc_free not implemented => leaking the payload");
-    return;
+    xbt_dynar_push(pd->msg_waitqueue,&msg);
+    return; /* FIXME: maybe we should call ourselves again until the end of the timer or a proper msg is got */
   }
   
   ctx.expeditor = msg.expe;
@@ -791,12 +815,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