X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/806a8ef96de0bc6fbb75cadb0fbd8f3ef824d0b8..710e2ad7303dce00b7a72feebdc2cec6823806b6:/src/gras/Msg/msg_private.h

diff --git a/src/gras/Msg/msg_private.h b/src/gras/Msg/msg_private.h
index 74917aeff8..6e8b0ad84e 100644
--- a/src/gras/Msg/msg_private.h
+++ b/src/gras/Msg/msg_private.h
@@ -16,7 +16,6 @@
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "xbt/error.h"
 #include "xbt/dynar.h"
 #include "xbt/set.h"
 #include "gras/transport.h"
@@ -24,10 +23,21 @@
 #include "gras/virtu.h"
 
 #include "gras/messages.h"
+#include "gras/timer.h"
 #include "gras_modinter.h"
 
 #include "gras/Msg/msg_interface.h"
 
+extern char _GRAS_header[6];
+ 
+/** @brief Message instance */
+typedef struct {
+  gras_socket_t   expeditor;
+  gras_msgtype_t  type;
+  void           *payload;
+  int             payload_size;
+} s_gras_msg_t, *gras_msg_t;
+
 /**
  * gras_msgtype_t:
  *
@@ -48,10 +58,10 @@ extern xbt_set_t _gras_msgtype_set; /* of gras_msgtype_t */
 void gras_msgtype_free(void *msgtype);
 
 
-xbt_error_t gras_msg_recv(gras_socket_t    sock,
-			   gras_msgtype_t  *msgtype,
-			   void           **payload,
-			   int             *payload_size);
+void gras_msg_recv(gras_socket_t    sock,
+		   gras_msgtype_t  *msgtype,
+		   void           **payload,
+		   int             *payload_size);
 
 /**
  * gras_cblist_t:
@@ -63,6 +73,23 @@ struct s_gras_cblist {
   xbt_dynar_t cbs; /* of gras_msg_cb_t */
 };
 
+typedef struct s_gras_cblist gras_cblist_t;
+void gras_cbl_free(void *); /* used to free the memory at the end */
 void gras_cblist_free(void *cbl);
 
+
+/* ********* *
+ * * TIMER * *
+ * ********* */
+typedef struct {
+  double expiry;
+  double period;
+  void_f_void_t action;
+  int repeat;
+} s_gras_timer_t, *gras_timer_t;
+
+/* returns 0 if it handled a timer, or the delay until next timer, or -1 if no armed timer */
+double gras_msg_timer_handle(void);
+
+
 #endif  /* GRAS_MESSAGE_PRIVATE_H */