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

diff --git a/src/gras/Msg/msg_private.h b/src/gras/Msg/msg_private.h
index 6e8b0ad84e..8366af1802 100644
--- a/src/gras/Msg/msg_private.h
+++ b/src/gras/Msg/msg_private.h
@@ -29,14 +29,18 @@
 #include "gras/Msg/msg_interface.h"
 
 extern char _GRAS_header[6];
+
+extern int gras_msg_libdata_id; /* The identifier of our libdata */
  
-/** @brief Message instance */
-typedef struct {
-  gras_socket_t   expeditor;
-  gras_msgtype_t  type;
-  void           *payload;
-  int             payload_size;
-} s_gras_msg_t, *gras_msg_t;
+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:
@@ -51,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);
 
 
-void 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:
@@ -77,6 +87,18 @@ 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 * *
@@ -92,4 +114,5 @@ typedef struct {
 double gras_msg_timer_handle(void);
 
 
+
 #endif  /* GRAS_MESSAGE_PRIVATE_H */