From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 20 Apr 2011 16:46:48 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_6_rc3~130^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/be90de47c20463008fa55dcafee17d506d10bc92?hp=-c

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

be90de47c20463008fa55dcafee17d506d10bc92
diff --combined src/simix/smx_context_base.c
index cb7437c80b,cdaa87a259..71760301ce
--- a/src/simix/smx_context_base.c
+++ b/src/simix/smx_context_base.c
@@@ -1,4 -1,4 +1,4 @@@
 -/* context_base - Code factorization accross context switching implementations */
 +/* context_base - Code factorization across context switching implementations */
  
  /* Copyright (c) 2010. The SimGrid Team.
   * All rights reserved.                                                     */
@@@ -87,6 -87,7 +87,7 @@@ void smx_ctx_base_stop(smx_context_t co
  {
    if (context->cleanup_func)
      (*(context->cleanup_func)) (context->data);
+   context->iwannadie = 0;
    SIMIX_req_process_cleanup(context->data);
  }