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

diff --git a/src/gras/Msg/msg_private.h b/src/gras/Msg/msg_private.h
index 7b03a7ae15..0bc3c5cc8d 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"
@@ -35,7 +36,7 @@ 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 */
-XBT_PUBLIC void 
+void 
 gras_msgtype_declare_ext(const char           *name,
 			 short int             version,
 			 e_gras_msg_kind_t     kind, 
@@ -65,14 +66,21 @@ void gras_msgtype_free(void *msgtype);
 
 
 /* functions to extract msg from socket or put it on wire (depend RL vs SG) */
-XBT_PUBLIC void gras_msg_recv(gras_socket_t   sock,
+void gras_msg_recv(gras_socket_t   sock,
 		   gras_msg_t      msg/*OUT*/);
-XBT_PUBLIC void gras_msg_send_ext(gras_socket_t   sock,
+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:
  *
@@ -84,8 +92,8 @@ struct s_gras_cblist {
 };
 
 typedef struct s_gras_cblist gras_cblist_t;
-XBT_PUBLIC void gras_cbl_free(void *); /* used to free the memory at the end */
-XBT_PUBLIC void gras_cblist_free(void *cbl);
+void gras_cbl_free(void *); /* used to free the memory at the end */
+void gras_cblist_free(void *cbl);
 
 /**
  * gras_msg_cb_ctx_t:
@@ -107,18 +115,27 @@ 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 */
-XBT_PUBLIC double gras_msg_timer_handle(void);
+double gras_msg_timer_handle(void);
 
-XBT_PUBLIC gras_msg_cb_ctx_t gras_msg_cb_ctx_new(gras_socket_t expe,
+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 */