Remove a crude hack where first call to surf_solve() finalize the initialization...

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

diff --git a/src/msg/private.h b/src/msg/private.h
index 7032a3a..b7a62ba 100644 (file)
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -23,12 +23,21 @@
 
 /**************** 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 **************************************/
 
@@ -95,8 +104,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,7 +116,7 @@ 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);
+                                    char * hostname, int argc, char **argv, xbt_dict_t properties);
 void _MSG_process_kill_from_SIMIX(void *p);