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

diff --git a/src/msg/private.h b/src/msg/private.h
index e78420d889..f72dd97e3e 100644
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -1,12 +1,12 @@
 /*     $Id$      */
-  
+
 /* Copyright (c) 2002-2007 Arnaud Legrand.                                  */
 /* Copyright (c) 2007 Bruno Donassolo.                                      */
 /* 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. */
-  
+
 #ifndef METASIMGRID_PRIVATE_H
 #define METASIMGRID_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 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 **************************************/
 
@@ -37,17 +48,17 @@ typedef struct simdata_task {
   smx_action_t comm;	        /* SURF modeling of communication  */
   double message_size;		/* Data size  */
   double computation_amount;	/* Computation size  */
-	smx_cond_t cond;					
+	smx_cond_t cond;
 	smx_mutex_t mutex; 				/* Task mutex */
   m_process_t sender;
   m_process_t receiver;
   m_host_t source;
   double priority;
   double rate;
-  int using;
+  int refcount ;
   /*******  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;
@@ -55,13 +66,13 @@ typedef struct simdata_task {
 /******************************* Process *************************************/
 
 typedef struct simdata_process {
-  m_host_t host;                /* the host on which the process is running */
-	smx_process_t smx_process;
+  m_host_t m_host;              /* the host on which the process is running */
+  smx_process_t s_process;
   int PID;			/* used for debugging purposes */
   int PPID;			/* The parent PID */
   m_host_t put_host;		/* used for debugging purposes */
   m_channel_t put_channel;	/* used for debugging purposes */
-	m_task_t waiting_task;
+  m_task_t waiting_task;
   int argc;                     /* arguments number if any */
   char **argv;                  /* arguments table if any */
   MSG_error_t last_errno;       /* the last value returned by a MSG_function */
@@ -69,9 +80,9 @@ 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 host;
+  m_host_t m_host;
   int argc;
   char **argv;
   double kill_time;
@@ -84,10 +95,13 @@ typedef struct MSG_Global {
   int max_channel;
   int PID;
   int session;
+  unsigned long int sent_msg; /* Total amount of messages sent during the simulation */
 } 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;
+
+
 /*************************************************************/
 
 #define PROCESS_SET_ERRNO(val) (MSG_process_self()->simdata->last_errno=val)
@@ -95,8 +109,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 +118,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);
 
+SG_END_DECL()
 #endif