X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b19f91d6d214949e7814070fd00c21425622229..12aab5cba474d567252148b4fbb5adf77781fb57:/src/gras/Msg/msg_private.h

diff --git a/src/gras/Msg/msg_private.h b/src/gras/Msg/msg_private.h
index 1cba35e252..484bdd3a68 100644
--- a/src/gras/Msg/msg_private.h
+++ b/src/gras/Msg/msg_private.h
@@ -17,6 +17,7 @@
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dynar.h"
+#include "xbt/queue.h"
 #include "xbt/set.h"
 #include "gras/transport.h"
 #include "gras/datadesc.h"
@@ -31,16 +32,16 @@
 extern char _GRAS_header[6];
 
 extern int gras_msg_libdata_id; /* The identifier of our libdata */
- 
+
 extern const char *e_gras_msg_kind_names[e_gras_msg_kind_count];
 
 /* declare either regular messages or RPC or whatever */
-void 
-gras_msgtype_declare_ext(const char           *name,
-			 short int             version,
-			 e_gras_msg_kind_t     kind, 
-			 gras_datadesc_type_t  payload_request,
-			 gras_datadesc_type_t  payload_answer);
+void
+gras_msgtype_declare_ext(const char *name,
+                         short int version,
+                         e_gras_msg_kind_t kind,
+                         gras_datadesc_type_t payload_request,
+                         gras_datadesc_type_t payload_answer);
 
 /**
  * gras_msgtype_t:
@@ -49,29 +50,33 @@ gras_msgtype_declare_ext(const char           *name,
  */
 typedef struct s_gras_msgtype {
   /* headers for the data set */
-  unsigned int   code;
-  char          *name;
-  unsigned int   name_len;
-        
+  unsigned int code;
+  char *name;
+  unsigned int name_len;
+
   /* payload */
   short int version;
   e_gras_msg_kind_t kind;
   gras_datadesc_type_t ctn_type;
-  gras_datadesc_type_t answer_type; /* only used for RPC */
+  gras_datadesc_type_t answer_type;     /* only used for RPC */
 } s_gras_msgtype_t;
 
-extern xbt_set_t _gras_msgtype_set; /* of gras_msgtype_t */
+extern xbt_set_t _gras_msgtype_set;     /* of gras_msgtype_t */
 void gras_msgtype_free(void *msgtype);
 
 
 /* functions to extract msg from socket or put it on wire (depend RL vs SG) */
-void gras_msg_recv(gras_socket_t   sock,
-		   gras_msg_t      msg/*OUT*/);
-void gras_msg_send_ext(gras_socket_t   sock,
-		     e_gras_msg_kind_t kind,
-		       unsigned long int ID,
-		       gras_msgtype_t  msgtype,
-		       void           *payload);
+void gras_msg_recv(gras_socket_t sock, gras_msg_t msg /*OUT*/);
+void gras_msg_send_ext(gras_socket_t sock,
+                       e_gras_msg_kind_t kind,
+                       unsigned long int ID,
+                       gras_msgtype_t msgtype, void *payload);
+
+/* The thread in charge of receiving messages and queuing them */
+typedef struct s_gras_msg_listener_ *gras_msg_listener_t;
+gras_msg_listener_t gras_msg_listener_launch(xbt_queue_t msg_exchange);
+/* The caller has the responsability to cleanup the queues himself */
+void gras_msg_listener_shutdown(gras_msg_listener_t);
 
 /**
  * gras_cblist_t:
@@ -80,11 +85,11 @@ void gras_msg_send_ext(gras_socket_t   sock,
  */
 struct s_gras_cblist {
   long int id;
-  xbt_dynar_t cbs; /* of gras_msg_cb_t */
+  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_cbl_free(void *);     /* used to free the memory at the end */
 void gras_cblist_free(void *cbl);
 
 /**
@@ -97,6 +102,7 @@ struct s_gras_msg_cb_ctx {
   gras_msgtype_t msgtype;
   unsigned long int ID;
   double timeout;
+  int answer_due;               /* Whether the callback is expected to return a result (for sanity checks) */
 };
 typedef struct s_gras_msg_cb_ctx s_gras_msg_cb_ctx_t;
 
@@ -106,13 +112,26 @@ typedef struct s_gras_msg_cb_ctx s_gras_msg_cb_ctx_t;
 typedef struct {
   double expiry;
   double period;
-  void_f_void_t *action;
+  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);
 
+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);
+
+
+
+/* We deploy a mallocator on the RPC contextes */
+#include "xbt/mallocator.h"
+extern xbt_mallocator_t gras_msg_ctx_mallocator;
+void *gras_msg_ctx_mallocator_new_f(void);
+void gras_msg_ctx_mallocator_free_f(void *dict);
+void gras_msg_ctx_mallocator_reset_f(void *dict);
 
 
-#endif  /* GRAS_MESSAGE_PRIVATE_H */
+#endif /* GRAS_MESSAGE_PRIVATE_H */