Remove MSG_process_kill_from_SIMIX

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index 61ef0ab..47e8570 100644 (file)
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -53,7 +53,7 @@ void MSG_init_nocheck(int *argc, char **argv) {
 
     SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
     SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);
 
     SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
     SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);

-    SIMIX_function_register_process_kill(MSG_process_kill_from_SIMIX);
+    SIMIX_function_register_process_kill(MSG_process_kill);

   }
 #ifdef HAVE_TRACING
   TRACE_start();
   }
 #ifdef HAVE_TRACING
   TRACE_start();

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index e95c019..7cf96e6 100644 (file)
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -148,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);
                                    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);
 void MSG_comm_copy_data_from_SIMIX(smx_action_t comm, void* buff, size_t buff_size);
 
 void _MSG_action_init(void);

diff --git a/src/msg/msg_process.c b/src/msg/msg_process.c
index fecae36..8579928 100644 (file)
--- a/src/msg/msg_process.c
+++ b/src/msg/msg_process.c
@@ -196,11 +196,6 @@ m_process_t MSG_process_create_with_environment(const char *name,
   return process;
 }
 
   return process;
 }
 

-void MSG_process_kill_from_SIMIX(smx_process_t p)
-{
-  MSG_process_kill(p);
-}
-

 /** \ingroup m_process_management
  * \param process poor victim
  *
 /** \ingroup m_process_management
  * \param process poor victim
  *