X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2539fff313cbd67c45b8490f7961e45e358d9ba2..16fdb8c65ac8d5baebc0278c499546c5fb10207b:/src/gras/Msg/msg_private.h

diff --git a/src/gras/Msg/msg_private.h b/src/gras/Msg/msg_private.h
index 4d4b5a6554..a14458081b 100644
--- a/src/gras/Msg/msg_private.h
+++ b/src/gras/Msg/msg_private.h
@@ -4,11 +4,10 @@
 
 /* module's private interface masked even to other parts of GRAS.           */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2003, 2004 Martin Quinson.                                 */
+/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
 
 /* This program is free software; you can redistribute it and/or modify it
-   under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #ifndef GRAS_MESSAGE_PRIVATE_H
 #define GRAS_MESSAGE_PRIVATE_H
@@ -17,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"
@@ -25,10 +23,39 @@
 #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   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:
  *
@@ -49,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:
@@ -64,6 +94,23 @@ struct s_gras_cblist {
   xbt_dynar_t cbs; /* of gras_msg_cb_t */
 };
 
+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);
 
+
+/* ********* *
+ * * TIMER * *
+ * ********* */
+typedef struct {
+  double expiry;
+  double period;
+  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);
+
+
 #endif  /* GRAS_MESSAGE_PRIVATE_H */