New function: gras_msg_wait_ext (for a finer control of accepted messages); introduce...

[simgrid.git] / src / gras / Msg / msg_private.h

diff --git a/src/gras/Msg/msg_private.h b/src/gras/Msg/msg_private.h
index b812469..a144580 100644 (file)
--- 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,18 +23,38 @@
 #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];
+
+extern int gras_msg_libdata_id; /* The identifier of our libdata */
+ 
+typedef enum {
+  e_gras_msg_kind_unknown = 0,
+  e_gras_msg_kind_oneway  = 1
+  /* future:
+       method call (answer expected; sessionID attached)
+       successful return (usual datatype attached, with sessionID)
+       error return (payload = exception)
+       [+ call cancel, and others]
+     even after: 
+       forwarding request and other application level routing stuff
+       group communication
+  */
+  
+} e_gras_msg_kind_t;
+ 
 /** @brief Message instance */
 typedef struct {
-  gras_socket_t   expeditor;
-  gras_msgtype_t  type;
-  void           *payload;
-  int             payload_size;
-} gras_msg_t;
+    gras_socket_t   expe;
+  e_gras_msg_kind_t kind;
+    gras_msgtype_t  type;
+    void           *payl;
+    int             payl_size;
+} s_gras_msg_t, *gras_msg_t;
 
 /**
  * gras_msgtype_t:
@@ -57,10 +76,13 @@ 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);
+/* 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,
+                      gras_msgtype_t  msgtype,
+                      void           *payload);
 
 /**
  * gras_cblist_t:
@@ -80,16 +102,15 @@ void gras_cblist_free(void *cbl);
 /* ********* *
  * * TIMER * *
  * ********* */
-typedef void (*void_f_void_t)(void);
-  
 typedef struct {
   double expiry;
   double period;
   void_f_void_t action;
   int repeat;
-} *gras_timer_t;
+} s_gras_timer_t, *gras_timer_t;
 
-extern xbt_dynar_t _gras_timers;
+/* 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 */