From 9b27268d9d9bb2c80b6d5107343665d1df982c6e Mon Sep 17 00:00:00 2001 From: alegrand Date: Wed, 1 Jun 2005 19:18:17 +0000 Subject: [PATCH 1/1] Reverting Mt's modifications. There is a problem in MSG_process_kill. I need to ensure that when I destroy a process, SURF won't try to bring it to life... git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1315 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/msg/m_process.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/msg/m_process.c b/src/msg/m_process.c index 21f8d36f8c..813bef2388 100644 --- a/src/msg/m_process.c +++ b/src/msg/m_process.c @@ -34,7 +34,7 @@ m_process_t MSG_process_create(const char *name, m_process_code_t code, void *data, m_host_t host) { - return MSG_process_create_with_arguments(name, code, data, host, -1, NULL, 0.0, -1.0); + return MSG_process_create_with_arguments(name, code, data, host, -1, NULL); } static void MSG_process_cleanup(void *arg) @@ -80,8 +80,7 @@ static void MSG_process_cleanup(void *arg) */ m_process_t MSG_process_create_with_arguments(const char *name, m_process_code_t code, void *data, - m_host_t host, int argc, char **argv, - double start_time, double kill_time) + m_host_t host, int argc, char **argv) { simdata_process_t simdata = xbt_new0(s_simdata_process_t,1); m_process_t process = xbt_new0(s_m_process_t,1); @@ -95,7 +94,6 @@ m_process_t MSG_process_create_with_arguments(const char *name, simdata->waiting_task = NULL; simdata->argc = argc; simdata->argv = argv; - simdata->kill_time = kill_time; simdata->context = xbt_context_new(code, NULL, NULL, MSG_process_cleanup, process, simdata->argc, simdata->argv); @@ -121,12 +119,7 @@ m_process_t MSG_process_create_with_arguments(const char *name, msg_global->current_process = self; xbt_fifo_push(msg_global->process_list, process); - if (start_time == 0.0) { - xbt_fifo_push(msg_global->process_to_run, process); - } else { - /* FIXME: let the process sleep for the specified amount of time */ - xbt_fifo_push(msg_global->process_to_run, process); - } + xbt_fifo_push(msg_global->process_to_run, process); PAJE_PROCESS_NEW(process); @@ -172,6 +165,7 @@ void MSG_process_kill(m_process_t process) } } + xbt_fifo_remove(msg_global->process_to_run,process); xbt_fifo_remove(msg_global->process_list,process); xbt_context_free(process->simdata->context); } -- 2.20.1