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

diff --git a/src/msg/private.h b/src/msg/private.h
index e78420d889..bdaea3c0c3 100644
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -24,7 +24,7 @@
 /**************** datatypes **********************************/
 
 typedef struct simdata_host {
-  smx_host_t host;			/* SURF modeling */
+  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 */
@@ -47,7 +47,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;
@@ -55,13 +55,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 +69,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;
@@ -95,8 +95,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 +104,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