X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f787351e3355ab558d4f491bc52bef2012eaa3e8..8a98063fe12e80a332a2f48d4b060815b7ae1efc:/src/gras/Msg/msg_interface.h

diff --git a/src/gras/Msg/msg_interface.h b/src/gras/Msg/msg_interface.h
index f7605c6f49..09df7c8738 100644
--- a/src/gras/Msg/msg_interface.h
+++ b/src/gras/Msg/msg_interface.h
@@ -13,33 +13,44 @@
 #define GRAS_MSG_INTERFACE_H
 
 #include "gras/transport.h"
+#include "xbt/fifo.h"
 
 /*
- * Data of this module specific to each process 
+ * Data of this module specific to each process
  * (used by sg_process.c to check some usual errors at the end of the simulation)
  * FIXME: it could be cleaned up ?
  */
 typedef struct {
-  /* set headers */
-  unsigned int ID;
-  char        *name;
-  unsigned int name_len;
+	/* set headers */
+	unsigned int ID;
+	char        *name;
+	unsigned int name_len;
 
-  /*queue of msgs storing the ones got while msg_wait'ing for something else */
-  xbt_dynar_t msg_queue; /* elm type: s_gras_msg_t */
+	/* queue storing the msgs got while msg_wait'ing for something else. Reuse them ASAP. */
+	xbt_dynar_t msg_queue; /* elm type: s_gras_msg_t */
 
-  /* registered callbacks for each message */
-  xbt_dynar_t cbl_list; /* elm type: gras_cblist_t */
-   
-  /* registered timers */
-  xbt_dynar_t timers; /* elm type: s_gras_timer_t */
+	/* queue storing the msgs without callback got when handling. Feed them to wait() */
+	xbt_dynar_t msg_waitqueue; /* elm type: s_gras_msg_t */
+
+	/* registered callbacks for each message */
+	xbt_dynar_t cbl_list; /* elm type: gras_cblist_t */
+
+	/* registered timers */
+	xbt_dynar_t timers; /* elm type: s_gras_timer_t */
+
+	/* queue storing the msgs that have to received and the process synchronization made (wait the surf action done) */
+	xbt_fifo_t msg_to_receive_queue; /* elm type: s_gras_msg_t */
+	xbt_fifo_t msg_to_receive_queue_meas; /* elm type: s_gras_msg_t */
+	xbt_queue_t msg_received;
 
 } s_gras_msg_procdata_t,*gras_msg_procdata_t;
 
 
-XBT_PUBLIC void gras_msg_send_namev(gras_socket_t  sock, 
-			 const char    *namev, 
-			 void          *payload);
+void gras_msg_send_namev(gras_socket_t  sock,
+		const char    *namev,
+		void          *payload);
+void gras_msg_listener_awake(void);
+void  gras_msg_listener_close_socket(int sd);
 
 #define GRAS_PROTOCOL_VERSION '\0';