X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eded0aed9492ec0bc966659640cc70b1c71771d8..42fa434f36a91436ae816143a148d2bd5cd07439:/src/gras/Msg/msg.c

diff --git a/src/gras/Msg/msg.c b/src/gras/Msg/msg.c
index 66867f64ef..6fcf0ad434 100644
--- 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);
 }
 
 /*
@@ -290,7 +300,7 @@ gras_msgtype_t gras_msgtype_by_id(int id) {
  */
 
 void
-gras_msg_wait_ext(double           timeout,    
+gras_msg_wait_ext_(double           timeout,    
 
 		  gras_msgtype_t   msgt_want,
 		  gras_socket_t    expe_want,
@@ -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),
@@ -385,15 +408,15 @@ gras_msg_wait_ext(double           timeout,
  * and used by subsequent call to this function or gras_msg_handle().
  */
 void
-gras_msg_wait(double           timeout,    
-	      gras_msgtype_t   msgt_want,
-	      gras_socket_t   *expeditor,
-	      void            *payload) {
+gras_msg_wait_(double           timeout,    
+	       gras_msgtype_t   msgt_want,
+	       gras_socket_t   *expeditor,
+	       void            *payload) {
   s_gras_msg_t msg;
 
-  gras_msg_wait_ext(timeout,
-		    msgt_want, NULL,      NULL, NULL,
-		    &msg);
+  gras_msg_wait_ext_(timeout,
+		     msgt_want, NULL,      NULL, NULL,
+		     &msg);
 
   if (msgt_want->ctn_type) {
     xbt_assert1(payload,
@@ -446,10 +469,10 @@ void gras_msg_wait_or(double         timeout,
   s_gras_msg_t msg;
 
   VERB1("Wait %f seconds for several message types",timeout);
-  gras_msg_wait_ext(timeout,
-		    NULL, NULL,      
-		    &gras_msg_wait_or_filter, (void*)msgt_want,
-		    &msg);
+  gras_msg_wait_ext_(timeout,
+		     NULL, NULL,      
+		     &gras_msg_wait_or_filter, (void*)msgt_want,
+		     &msg);
 
   if (msg.type->ctn_type) {
     xbt_assert1(payload,
@@ -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);
@@ -473,7 +497,7 @@ void gras_msg_wait_or(double         timeout,
 /** \brief Send the data pointed by \a payload as a message of type
  * \a msgtype to the peer \a sock */
 void
-gras_msg_send(gras_socket_t   sock,
+gras_msg_send_(gras_socket_t   sock,
 	      gras_msgtype_t  msgtype,
 	      void           *payload) {
 
@@ -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;
@@ -648,7 +672,7 @@ gras_msg_handle(double timeOut) {
 	if (!ran_ok) {
 	  DEBUG4("Use the callback #%d (@%p) for incomming msg %s (payload_size=%d)",
 		cpt+1,cb,msg.type->name,msg.payl_size);
-	  if ((*cb)(&ctx,msg.payl)) {
+	  if (!(*cb)(&ctx,msg.payl)) {
 	    /* cb handled the message */
 	    free(msg.payl);
 	    ran_ok = 1;
@@ -717,12 +741,12 @@ gras_cbl_free(void *data){
 /** \brief Bind the given callback to the given message type 
  *
  * Several callbacks can be attached to a given message type. The lastly added one will get the message first, and 
- * if it returns false, the message will be passed to the second one. 
+ * if it returns a non-null value, the message will be passed to the second one. 
  * And so on until one of the callbacks accepts the message.
  */
 void
-gras_cb_register(gras_msgtype_t msgtype,
-		 gras_msg_cb_t cb) {
+gras_cb_register_(gras_msgtype_t msgtype,
+		  gras_msg_cb_t cb) {
   gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_by_id(gras_msg_libdata_id);
   gras_cblist_t *list=NULL;
   int cpt;
@@ -751,8 +775,8 @@ gras_cb_register(gras_msgtype_t msgtype,
 
 /** \brief Unbind the given callback from the given message type */
 void
-gras_cb_unregister(gras_msgtype_t msgtype,
-		   gras_msg_cb_t cb) {
+gras_cb_unregister_(gras_msgtype_t msgtype,
+		    gras_msg_cb_t cb) {
 
   gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_by_id(gras_msg_libdata_id);
   gras_cblist_t *list;
@@ -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