X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/535815db45bb2162b257e5c208ee7015dd2cc8f6..df12bbc75c274351f3b3a628740e0b3270f08e18:/src/msg/msg_private.h

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index cc570f1867..2b3e69b60a 100644
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -28,9 +28,9 @@ typedef struct simdata_task {
   smx_action_t comm;            /* SIMIX modeling of communication */
   double message_size;          /* Data size */
   double computation_amount;    /* Computation size */
-  m_process_t sender;
-  m_process_t receiver;
-  m_host_t source;
+  msg_process_t sender;
+  msg_process_t receiver;
+  msg_host_t source;
   double priority;
   double rate;
   int isused;  /* Indicates whether the task is used in SIMIX currently */
@@ -58,10 +58,10 @@ typedef struct simdata_gpu_task {
 /******************************* Process *************************************/
 
 typedef struct simdata_process {
-  m_host_t m_host;              /* the host on which the process is running */
+  msg_host_t m_host;              /* the host on which the process is running */
   int PID;                      /* used for debugging purposes */
   int PPID;                     /* The parent PID */
-  m_host_t put_host;            /* used for debugging purposes */
+  msg_host_t put_host;            /* used for debugging purposes */
 #ifdef MSG_USE_DEPRECATED
   m_channel_t put_channel;      /* used for debugging purposes */
 #endif
@@ -70,6 +70,9 @@ typedef struct simdata_process {
   char **argv;                  /* arguments table if any */
   int argc;                     /* arguments number if any */
   MSG_error_t last_errno;       /* the last value returned by a MSG_function */
+
+  msg_vm_t vm;                 /* virtual machine the process is in */
+
   void* data;                   /* user data */
 } s_simdata_process_t, *simdata_process_t;
 
@@ -77,13 +80,12 @@ typedef struct process_arg {
   const char *name;
   xbt_main_func_t code;
   void *data;
-  m_host_t m_host;
+  msg_host_t m_host;
   int argc;
   char **argv;
   double kill_time;
 } s_process_arg_t, *process_arg_t;
 
-
 typedef struct msg_comm {
   smx_action_t s_comm;          /* SIMIX communication object encapsulated (the same for both processes) */
   m_task_t task_sent;           /* task sent (NULL for the receiver) */
@@ -100,15 +102,10 @@ typedef struct msg_vm {
   s_xbt_swag_hookup_t host_vms_hookup;
   xbt_dynar_t processes;
   e_msg_vm_state_t state;
-  m_host_t location;
+  msg_host_t location;
   int coreAmount;
 } s_msg_vm_t;
 
-typedef struct s_msg_process_data {
-	void *data;
-	msg_vm_t current_vm;
-} s_msg_process_data_t, *msg_process_data_t;
-
 /************************** Global variables ********************************/
 typedef struct MSG_Global {
   xbt_fifo_t host;
@@ -118,7 +115,7 @@ typedef struct MSG_Global {
   int PID;
   int session;
   unsigned long int sent_msg;   /* Total amount of messages sent during the simulation */
-  void (*task_copy_callback) (m_task_t task, m_process_t src, m_process_t dst);
+  void (*task_copy_callback) (m_task_t task, msg_process_t src, msg_process_t dst);
   void_f_pvoid_t process_data_cleanup;
   xbt_swag_t vms;
 } s_MSG_Global_t, *MSG_Global_t;
@@ -141,8 +138,8 @@ XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
 #  define MSG_RETURN(val) return(val)
 #endif
 
-m_host_t __MSG_host_create(smx_host_t workstation);
-void __MSG_host_destroy(m_host_t host);
+msg_host_t __MSG_host_create(smx_host_t workstation);
+void __MSG_host_destroy(msg_host_t host);
 
 void __MSG_display_process_status(void);
 
@@ -150,8 +147,7 @@ void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc);
 void MSG_process_create_from_SIMIX(smx_process_t *process, const char *name,
                                    xbt_main_func_t code, void *data,
                                    const char *hostname, double kill_time,  int argc,
-                                   char **argv, xbt_dict_t properties);
-void MSG_process_kill_from_SIMIX(smx_process_t p);
+                                   char **argv, xbt_dict_t properties, int auto_restart);
 void MSG_comm_copy_data_from_SIMIX(smx_action_t comm, void* buff, size_t buff_size);
 
 void _MSG_action_init(void);