X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c354c48ec90c997cc7213ce96ca97d882934166..778f65057da68465382593cd036b6ee59ada54e9:/src/gras/Msg/msg_interface.h

diff --git a/src/gras/Msg/msg_interface.h b/src/gras/Msg/msg_interface.h
index b757ded834..3595ead608 100644
--- a/src/gras/Msg/msg_interface.h
+++ b/src/gras/Msg/msg_interface.h
@@ -4,7 +4,7 @@
 
 /* module's public interface exported within GRAS, but not to end user.     */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* 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. */
@@ -12,20 +12,39 @@
 #ifndef GRAS_MSG_INTERFACE_H
 #define GRAS_MSG_INTERFACE_H
 
-/* gras_msg_t is dereferenced to be stored in procdata, living in Virtu */
+#include "gras/transport.h"
+
+/*
+ * Data of this module specific to each process 
+ * (used by sg_process.c to check some usual errors at the end of the simulation)
+ * FIXME: it could be cleaned up ?
+ */
 typedef struct {
-  gras_socket_t   expeditor;
-  gras_msgtype_t  type;
-  void           *payload;
-  int             payload_size;
-} gras_msg_t;
+  /* set headers */
+  unsigned int ID;
+  char        *name;
+  unsigned int name_len;
+
+  /* queue storing the msgs got while msg_wait'ing for something else. Reuse them ASAP. */
+  xbt_dynar_t msg_queue; /* elm type: s_gras_msg_t */
+
+  /* queue storing the msgs without callback got when handling. Feed them to wait() */
+  xbt_dynar_t msg_waitqueue; /* elm type: s_gras_msg_t */
+
+  /* registered callbacks for each message */
+  xbt_dynar_t cbl_list; /* elm type: gras_cblist_t */
+   
+  /* registered timers */
+  xbt_dynar_t timers; /* elm type: s_gras_timer_t */
 
-xbt_error_t gras_msg_send_namev(gras_socket_t  sock, 
-				 const char    *namev, 
-				 void          *payload);
+} s_gras_msg_procdata_t,*gras_msg_procdata_t;
+
+
+void gras_msg_send_namev(gras_socket_t  sock, 
+			 const char    *namev, 
+			 void          *payload);
 
 #define GRAS_PROTOCOL_VERSION '\0';
 
-typedef struct s_gras_cblist gras_cblist_t;
-void gras_cbl_free(void *); /* virtu use that to free the memory at the end */
+
 #endif  /* GRAS_MSG_INTERFACE_H */