X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0d379536a99d65399ab2a1b212ecd5a2718945dc..dff9e15c44ab6340d27215957c56fa72fad246a2:/src/gras/Msg/msg_interface.h

diff --git a/src/gras/Msg/msg_interface.h b/src/gras/Msg/msg_interface.h
index b16ed5a3d6..0bad57a869 100644
--- a/src/gras/Msg/msg_interface.h
+++ b/src/gras/Msg/msg_interface.h
@@ -13,30 +13,45 @@
 #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 {
-  /*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 */
+  /* set headers */
+  unsigned int ID;
+  char *name;
+  unsigned int name_len;
+
+  /* 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 */
+
+  /* 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 */
-   
+  xbt_dynar_t cbl_list;         /* elm type: gras_cblist_t */
+
   /* registered timers */
-  xbt_dynar_t timers; /* elm type: s_gras_timer_t */
+  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;
+} s_gras_msg_procdata_t, *gras_msg_procdata_t;
 
 
-xbt_error_t 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';
+#define GRAS_PROTOCOL_VERSION '\1';
 
 
-#endif  /* GRAS_MSG_INTERFACE_H */
+#endif /* GRAS_MSG_INTERFACE_H */