From: thiery <thiery@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 24 Feb 2011 14:24:41 +0000 (+0000)
Subject: Simplify process cleanup calls between SIMIX and MSG
X-Git-Tag: v3.6_beta2~231
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/987e8b845b039f176b5e7fe5f0fb38d728e02d99?hp=e20d6e2c634bba1e7d1b2ca4e9b7627338655c23

Simplify process cleanup calls between SIMIX and MSG

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

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index b54f233e44..046f73cc88 100644
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -43,7 +43,6 @@ void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc)
 #endif
 
   xbt_free(msg_proc);
-  SIMIX_req_process_cleanup(smx_proc);
 }
 
 /* This function creates a MSG process. It has the prototype enforced by SIMIX_function_register_process_create */
diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c
index 5403bd834c..27443d56d7 100644
--- a/src/simix/smx_context_base.c
+++ b/src/simix/smx_context_base.c
@@ -9,6 +9,7 @@
 
 #include "xbt/function_types.h"
 #include "simix/context.h"
+#include "simix/process_private.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
 
@@ -86,6 +87,7 @@ void smx_ctx_base_stop(smx_context_t context)
 {
   if (context->cleanup_func)
     (*(context->cleanup_func)) (context->data);
+  SIMIX_process_cleanup(context->data);
 }
 
 smx_context_t smx_ctx_base_self(void)