Work around newly reincreased paranoia of gcc and libc on ubuntu. It's geting hard...

[simgrid.git] / src / msg / private.h

diff --git a/src/msg/private.h b/src/msg/private.h
index 56ea0b8..9f95cee 100644 (file)
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -21,14 +21,25 @@
 #include "xbt/context.h"
 #include "xbt/config.h"
 
+SG_BEGIN_DECL()
+
 /**************** datatypes **********************************/
 
-typedef struct simdata_host {
-  smx_host_t smx_host;                 /* SURF modeling */
-  xbt_fifo_t *mbox;            /* array of FIFOs used as a mailboxes  */
-  smx_cond_t *sleeping;        /* array of conditions on which the processes sleep if they are waiting for a communication on a channel */
-       smx_mutex_t mutex; /* mutex to access the host */
-} s_simdata_host_t;
+/* this structure represents a mailbox */
+typedef struct s_msg_mailbox
+{
+       char* alias;                                            /* the key of the mailbox in the global dictionary                      */
+       xbt_fifo_t tasks;                                       /* the list of the tasks in the mailbox                                         */
+       smx_cond_t cond;                                        /* the condition on the mailbox                                                         */
+       char* hostname;                                         /* the name of the host containing the mailbox                          */
+}s_msg_mailbox_t;
+
+typedef struct simdata_host 
+{
+       smx_host_t smx_host;                            /* SURF modeling                                                                */
+       struct s_msg_mailbox** mailboxes;       /* mailboxes to store msg tasks of of the host  */
+       smx_mutex_t mutex;                                      /* mutex to access the host                                     */
+}s_simdata_host_t;
 
 /********************************* Task **************************************/
 
@@ -44,7 +55,7 @@ typedef struct simdata_task {
   m_host_t source;
   double priority;
   double rate;
-  int using;
+  int refcount ;
   /*******  Parallel Tasks Only !!!! *******/
   int host_nb;
   smx_host_t *host_list;
@@ -86,7 +97,9 @@ typedef struct MSG_Global {
   int session;
 } s_MSG_Global_t, *MSG_Global_t;
 
-extern MSG_Global_t msg_global;
+/*extern MSG_Global_t msg_global;*/
+XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
+
       
 /*************************************************************/
 
@@ -95,8 +108,8 @@ extern MSG_Global_t msg_global;
 #define MSG_RETURN(val) do {PROCESS_SET_ERRNO(val);return(val);} while(0)
 /* #define CHECK_ERRNO()  ASSERT((PROCESS_GET_ERRNO()!=MSG_HOST_FAILURE),"Host failed, you cannot call this function.") */
 
-#define CHECK_HOST()  xbt_assert0(SIMIX_host_get_state(SIMIX_host_self())==1,\
-                                  "Host failed, you cannot call this function.")
+#define CHECK_HOST()  xbt_assert1(SIMIX_host_get_state(SIMIX_host_self())==1,\
+                                  "Host failed, you cannot call this function. (state=%d)",SIMIX_host_get_state(SIMIX_host_self()))
 
 m_host_t __MSG_host_create(smx_host_t workstation, void *data);
 
@@ -107,11 +120,8 @@ void __MSG_display_process_status(void);
 void __MSG_process_cleanup(void *arg);
 void *_MSG_process_create_from_SIMIX(const char *name,
                                     xbt_main_func_t code, void *data,
-                                    char * hostname, int argc, char **argv);
-void *_MSG_process_create_with_env_from_SIMIX(const char *name,
-                                    xbt_main_func_t code, void *data,
-                                    char *hostname, int argc, char **argv, xbt_dict_t properties);
+                                    char * hostname, int argc, char **argv, xbt_dict_t properties);
 void _MSG_process_kill_from_SIMIX(void *p);
 
-
+SG_END_DECL()
 #endif