Here come the new GRAS RPC

[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..8366af1 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,24 @@
 #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];
 
-/** @brief Message instance */
-typedef struct {
-  gras_socket_t   expeditor;
-  gras_msgtype_t  type;
-  void           *payload;
-  int             payload_size;
-} gras_msg_t;
+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);
 
 /**
  * gras_msgtype_t:
@@ -50,17 +55,23 @@ typedef struct s_gras_msgtype {
         
   /* 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 */
 } s_gras_msgtype_t;
 
 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,
+                      unsigned long int ID,
+                      gras_msgtype_t  msgtype,
+                      void           *payload);
 
 /**
  * gras_cblist_t:
@@ -76,20 +87,32 @@ 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);
 
+/**
+ * gras_msg_cbctx_t:
+ *
+ * Context associated to a given callback (to either regular message or RPC)
+ */
+struct s_gras_msg_cb_ctx {
+  gras_socket_t expeditor;
+  gras_msgtype_t msgtype;
+  unsigned long int ID;
+  
+};
+typedef struct s_gras_msg_cb_ctx s_gras_msg_cb_ctx_t;
 
 /* ********* *
  * * 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;
+
+/* 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);
 
-extern xbt_dynar_t _gras_timers;
 
 
 #endif  /* GRAS_MESSAGE_PRIVATE_H */