X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a21edf0ad00eee185ec492e9bbf094901fa25fe..5d097a8eff62c30f43d29b01bf90e7dc9a42d471:/src/msg/msg_process.c diff --git a/src/msg/msg_process.c b/src/msg/msg_process.c index 449c5aef44..259fb7d05e 100644 --- a/src/msg/msg_process.c +++ b/src/msg/msg_process.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2004-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -46,16 +46,10 @@ void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc) TRACE_msg_process_end(smx_proc); #endif // free the data if a function was provided - if (msg_proc->data && msg_global->process_data_cleanup) { + if (msg_proc && msg_proc->data && msg_global->process_data_cleanup) { msg_global->process_data_cleanup(msg_proc->data); } - // remove the process from its virtual machine - if (msg_proc->vm) { - int pos = xbt_dynar_search(msg_proc->vm->processes,&smx_proc); - xbt_dynar_remove_at(msg_proc->vm->processes,pos, NULL); - } - // free the MSG process xbt_free(msg_proc); }