Kill the useless _MSG_process_create_with_env_from_SIMIX(). _MSG_process_create_from_...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4897 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/msg/global.c b/src/msg/global.c
index 09623af..7109a43 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -54,7 +54,7 @@ void MSG_global_init(int *argc, char **argv)
     msg_global->max_channel = 0;
     msg_global->PID = 1;
 
-    SIMIX_function_register_process_create(_MSG_process_create_with_env_from_SIMIX);
+    SIMIX_function_register_process_create(_MSG_process_create_from_SIMIX);
     SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
     SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
   }

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 6bd53d0..8f3d6d5 100644 (file)
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -59,27 +59,16 @@ void __MSG_process_cleanup(void *arg)
   return;
 }
 
-/* This function creates a MSG process. It has the prototype by SIMIX_function_register_process_create */
+/* This function creates a MSG process. It has the prototype enforced by SIMIX_function_register_process_create */
 void *_MSG_process_create_from_SIMIX(const char *name,
-                                    xbt_main_func_t code, void *data,
-                                    char *hostname, int argc, char **argv)
-{
-  m_host_t host = MSG_get_host_by_name(hostname);
-  return (void *) MSG_process_create_with_arguments(name, code, data, host,
-                                                   argc, argv);
-}
-
-/* This function creates a MSG process with properties. It has the prototype by SIMIX_function_register_process_create */
-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)
 {
   m_host_t host = MSG_get_host_by_name(hostname);
   return (void *) MSG_process_create_with_environment(name, code, data, host,
-                                                   argc, argv,properties);
+                                                     argc, argv,properties);
 }
 
-
 /** \ingroup m_process_management
  * \brief Creates and runs a new #m_process_t.
 

diff --git a/src/msg/private.h b/src/msg/private.h
index 56ea0b8..fcf305e 100644 (file)
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -107,10 +107,7 @@ void __MSG_display_process_status(void);
 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);
+                                    char * hostname, int argc, char **argv, xbt_dict_t properties);
 void _MSG_process_kill_from_SIMIX(void *p);