X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6d17036094433f0304c29b6f57922cee32b0c67c..d6d7151bb90b62f3cc983b6a9fa4ffae66181412:/src/msg/m_process.c diff --git a/src/msg/m_process.c b/src/msg/m_process.c index 586e756134..baf331655a 100644 --- a/src/msg/m_process.c +++ b/src/msg/m_process.c @@ -57,6 +57,16 @@ void __MSG_process_cleanup(void *arg) return; } +/* This function creates a MSG process. It has the prototype 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); +} + + /** \ingroup m_process_management * \brief Creates and runs a new #m_process_t. @@ -82,16 +92,6 @@ void __MSG_process_cleanup(void *arg) * \return The new corresponding object. */ - - -m_process_t __MSG_process_create_with_arguments(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 MSG_process_create_with_arguments(name,code,data,host,argc,argv); -} - m_process_t MSG_process_create_with_arguments(const char *name, xbt_main_func_t code, void *data, m_host_t host, int argc, char **argv) @@ -107,8 +107,7 @@ m_process_t MSG_process_create_with_arguments(const char *name, simdata->argc = argc; simdata->argv = argv; simdata->s_process = SIMIX_process_create(name, code, - (void*)process, host->name, argc, argv, - __MSG_process_cleanup ); + (void*)process, host->name, argc, argv); if (SIMIX_process_self()) { simdata->PPID = MSG_process_get_PID(SIMIX_process_self()->data); @@ -128,6 +127,11 @@ m_process_t MSG_process_create_with_arguments(const char *name, return process; } + +void _MSG_process_kill_from_SIMIX(void *p) { + MSG_process_kill((m_process_t)p); +} + /** \ingroup m_process_management * \param process poor victim *