plug a memleak on exit

[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 6d71574..1739d8b 100644 (file)
--- a/src/gras/Msg/msg_private.h
+++ b/src/gras/Msg/msg_private.h
@@ -4,24 +4,46 @@
 
 /* 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
 
-#include "gras_private.h"
+#include "gras_config.h"
+
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+#include "xbt/error.h"
+#include "xbt/dynar.h"
+#include "xbt/set.h"
+#include "gras/transport.h"
+#include "gras/datadesc.h"
+#include "gras/virtu.h"
+
+#include "gras/messages.h"
+#include "gras/timer.h"
+#include "gras_modinter.h"
+
 #include "gras/Msg/msg_interface.h"
 
+
+/** @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;
+
 /**
  * gras_msgtype_t:
  *
  * Message type descriptor. There one of these for each registered version.
  */
-struct s_gras_msgtype {
+typedef struct s_gras_msgtype {
   /* headers for the data set */
   unsigned int   code;
   char          *name;
@@ -29,15 +51,15 @@ struct s_gras_msgtype {
         
   /* payload */
   short int version;
-  gras_datadesc_type_t *ctn_type;
-};
+  gras_datadesc_type_t ctn_type;
+} s_gras_msgtype_t;
 
-extern gras_set_t *_gras_msgtype_set; /* of gras_msgtype_t */
+extern xbt_set_t _gras_msgtype_set; /* of gras_msgtype_t */
 void gras_msgtype_free(void *msgtype);
 
 
-gras_error_t gras_msg_recv(gras_socket_t   *sock,
-                          gras_msgtype_t **msgtype,
+xbt_error_t gras_msg_recv(gras_socket_t    sock,
+                          gras_msgtype_t  *msgtype,
                           void           **payload,
                           int             *payload_size);
 
@@ -48,9 +70,26 @@ gras_error_t gras_msg_recv(gras_socket_t   *sock,
  */
 struct s_gras_cblist {
   long int id;
-  gras_dynar_t *cbs; /* of gras_msg_cb_t */
+  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 */