Usefull function to "kill" a context before the function it was executing has terminated.

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

diff --git a/include/xbt/context.h b/include/xbt/context.h
index e035c7b..ea8a6f5 100644 (file)
--- a/include/xbt/context.h
+++ b/include/xbt/context.h
@@ -20,6 +20,7 @@ xbt_context_t xbt_context_new(xbt_context_function_t code,
                              void_f_pvoid_t startup_func, void *startup_arg,
                              void_f_pvoid_t cleanup_func, void *cleanup_arg,
                              int argc, char *argv[]);
+void xbt_context_free(xbt_context_t context);
 void xbt_context_start(xbt_context_t context);
 void xbt_context_yield(void);
 void xbt_context_schedule(xbt_context_t context);

diff --git a/src/xbt/context.c b/src/xbt/context.c
index d371757..6ee1726 100644 (file)
--- a/src/xbt/context.c
+++ b/src/xbt/context.c
@@ -187,9 +187,25 @@ void xbt_context_exit(void) {
   xbt_swag_free(context_to_destroy);
 
   while((context=xbt_swag_extract(context_living)))
-    xbt_context_destroy(context);
+    xbt_context_free(context);
 
   xbt_swag_free(context_living);
 
   init_context = current_context = NULL ;
 }
+
+void xbt_context_free(xbt_context_t context)
+{
+  int i ;
+
+  xbt_swag_remove(context, context_living);  
+  for(i=0;i<context->argc; i++) 
+    if(context->argv[i]) xbt_free(context->argv[i]);
+  if(context->argv) xbt_free(context->argv);
+  
+  if(context->cleanup_func)
+    context->cleanup_func(context->cleanup_arg);
+  xbt_context_destroy(context);
+
+  return;
+}