* Cleanup the DTD by renaming:

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

diff --git a/src/msg/private.h b/src/msg/private.h
index e78420d..56ea0b8 100644 (file)
--- 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;
@@ -104,9 +104,14 @@ 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);
+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);
+void _MSG_process_kill_from_SIMIX(void *p);
 
 
 #endif