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

diff --git a/src/gras/Msg/msg_private.h b/src/gras/Msg/msg_private.h
index 8366af1802..69fd2dc414 100644
--- a/src/gras/Msg/msg_private.h
+++ b/src/gras/Msg/msg_private.h
@@ -12,7 +12,7 @@
 #ifndef GRAS_MESSAGE_PRIVATE_H
 #define GRAS_MESSAGE_PRIVATE_H
 
-#include "gras_config.h"
+#include "portable.h"
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
@@ -35,7 +35,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 */
-void 
+XBT_PUBLIC void 
 gras_msgtype_declare_ext(const char           *name,
 			 short int             version,
 			 e_gras_msg_kind_t     kind, 
@@ -65,9 +65,9 @@ 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,
+XBT_PUBLIC void gras_msg_recv(gras_socket_t   sock,
 		   gras_msg_t      msg/*OUT*/);
-void gras_msg_send_ext(gras_socket_t   sock,
+XBT_PUBLIC void gras_msg_send_ext(gras_socket_t   sock,
 		     e_gras_msg_kind_t kind,
 		       unsigned long int ID,
 		       gras_msgtype_t  msgtype,
@@ -84,11 +84,11 @@ struct s_gras_cblist {
 };
 
 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);
+XBT_PUBLIC void gras_cbl_free(void *); /* used to free the memory at the end */
+XBT_PUBLIC void gras_cblist_free(void *cbl);
 
 /**
- * gras_msg_cbctx_t:
+ * gras_msg_cb_ctx_t:
  *
  * Context associated to a given callback (to either regular message or RPC)
  */
@@ -96,7 +96,8 @@ struct s_gras_msg_cb_ctx {
   gras_socket_t expeditor;
   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 +107,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);
+XBT_PUBLIC double gras_msg_timer_handle(void);
 
+XBT_PUBLIC 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;
+XBT_PUBLIC void* gras_msg_ctx_mallocator_new_f(void);
+XBT_PUBLIC void gras_msg_ctx_mallocator_free_f(void* dict);
+XBT_PUBLIC void gras_msg_ctx_mallocator_reset_f(void* dict);
 
 
 #endif  /* GRAS_MESSAGE_PRIVATE_H */