X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a0432353f714a914f179660603a6ce728070a7ec..e08ccfc85466d59704df52779255e26a2e4383af:/src/msg/private.h

diff --git a/src/msg/private.h b/src/msg/private.h
index 80ac9e2bfa..b7a62ba51d 100644
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -23,12 +23,21 @@
 
 /**************** datatypes **********************************/
 
-typedef struct simdata_host {
-  smx_host_t s_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 **************************************/
 
@@ -47,7 +56,7 @@ typedef struct simdata_task {
   int using;
   /*******  Parallel Tasks Only !!!! *******/
   int host_nb;
-  void * *host_list;            /* SURF modeling */
+  smx_host_t *host_list;
   double *comp_amount;
   double *comm_amount;
 } s_simdata_task_t;
@@ -69,7 +78,7 @@ typedef struct simdata_process {
 
 typedef struct process_arg {
   const char *name;
-  m_process_code_t code;
+  xbt_main_func_t code;
   void *data;
   m_host_t m_host;
   int argc;
@@ -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);
 
@@ -104,9 +113,11 @@ void __MSG_host_destroy(m_host_t host);
 
 void __MSG_display_process_status(void);
 
-m_process_t __MSG_process_create_with_arguments(const char *name,
-						m_process_code_t code, void *data,
-						char * hostname, int argc, char **argv);
+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, xbt_dict_t properties);
+void _MSG_process_kill_from_SIMIX(void *p);
 
 
 #endif