New, proper, module mecanism. Still missing dependency tracking, but already allow...

[simgrid.git] / include / gras / messages.h

diff --git a/include/gras/messages.h b/include/gras/messages.h
index bba9f46..ded4199 100644 (file)
--- a/include/gras/messages.h
+++ b/include/gras/messages.h
@@ -92,7 +92,13 @@ typedef struct s_gras_msgtype *gras_msgtype_t;
   typedef struct s_gras_msg_cb_ctx *gras_msg_cb_ctx_t;
 
 gras_socket_t gras_msg_cb_ctx_from(gras_msg_cb_ctx_t ctx);
-
+gras_msg_cb_ctx_t gras_msg_cb_ctx_new(gras_socket_t expe, 
+                                     gras_msgtype_t msgtype,
+                                     unsigned long int ID,
+                                     double timeout);
+void gras_msg_cb_ctx_free(gras_msg_cb_ctx_t ctx) ;
+   
+   
   /** \brief Type of message callback functions. 
    *
    * \param expeditor: a socket to contact who sent this message
@@ -116,6 +122,25 @@ gras_socket_t gras_msg_cb_ctx_from(gras_msg_cb_ctx_t ctx);
 
 /** @} */  
 
+/** @defgroup GRAS_msg_exchange Message exchange 
+ *  @ingroup  GRAS_msg
+ *
+ */
+/** @{ */
+
+
+  void gras_msg_send(gras_socket_t   sock,
+                    gras_msgtype_t  msgtype,
+                    void           *payload);
+  void gras_msg_wait(double          timeout,    
+                    gras_msgtype_t  msgt_want,
+                    gras_socket_t  *expeditor,
+                    void           *payload);
+  void gras_msg_handleall(double period);   
+  void gras_msg_handle(double timeOut);
+
+/** @} */
+
 /** @defgroup GRAS_msg_rpc RPC specific functions
  *  @ingroup  GRAS_msg
  *
@@ -147,6 +172,13 @@ void gras_msg_rpccall(gras_socket_t server,
                      double timeOut,
                      gras_msgtype_t msgtype,
                      void *request, void *answer);
+gras_msg_cb_ctx_t
+gras_msg_rpc_async_call(gras_socket_t server,
+                       double timeOut,
+                       gras_msgtype_t msgtype,
+                       void *request);
+void gras_msg_rpc_async_wait(gras_msg_cb_ctx_t ctx,
+                            void *answer);
 
 /* server side */
 void gras_msg_rpcreturn(double timeOut, gras_msg_cb_ctx_t ctx,void *answer);
@@ -154,23 +186,6 @@ void gras_msg_rpcreturn(double timeOut, gras_msg_cb_ctx_t ctx,void *answer);
 
 /** @} */
 
-/** @defgroup GRAS_msg_exchange Message exchange 
- *  @ingroup  GRAS_msg
- *
- */
-/** @{ */
-
-
-  void gras_msg_send(gras_socket_t   sock,
-                    gras_msgtype_t  msgtype,
-                    void           *payload);
-  void gras_msg_wait(double          timeout,    
-                    gras_msgtype_t  msgt_want,
-                    gras_socket_t  *expeditor,
-                    void           *payload);
-  void gras_msg_handle(double timeOut);
-
-/** @} */
 /** @defgroup GRAS_msg_exchangeadv Message exchange (advanced interface)
  *  @ingroup  GRAS_msg
  *
@@ -212,12 +227,18 @@ typedef struct {
 
 typedef int (*gras_msg_filter_t)(gras_msg_t msg,void *ctx);
 
-  void gras_msg_wait_ext(double           timeout,    
-                        gras_msgtype_t   msgt_want,
-                        gras_socket_t    expe_want,
-                        gras_msg_filter_t filter,
-                        void             *filter_ctx, 
-                        gras_msg_t       msg_got);
+void gras_msg_wait_ext(double           timeout,    
+                      gras_msgtype_t   msgt_want,
+                      gras_socket_t    expe_want,
+                      gras_msg_filter_t filter,
+                      void             *filter_ctx, 
+                      gras_msg_t       msg_got);
+
+void gras_msg_wait_or(double         timeout,    
+                     xbt_dynar_t    msgt_want,
+                     gras_msg_cb_ctx_t *ctx,
+                     int           *msgt_got,
+                     void          *payload);
 
 
 /* @} */