Remove MSG_process_kill_from_SIMIX

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

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index cc570f1..7cf96e6 100644 (file)
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -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;
 
@@ -83,7 +86,6 @@ typedef struct process_arg {
   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) */
@@ -104,11 +106,6 @@ typedef struct msg_vm {
   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;
@@ -151,7 +148,6 @@ 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);
 void MSG_comm_copy_data_from_SIMIX(smx_action_t comm, void* buff, size_t buff_size);
 
 void _MSG_action_init(void);