X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1e95638dfc42f5d1c9152d36685ca60b52e4bb7a..accfd692f05242b17dd620dc3494426572604aa7:/src/simix/smx_context_raw.c

diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c
index 9cc54536de..ea8e9606e0 100644
--- a/src/simix/smx_context_raw.c
+++ b/src/simix/smx_context_raw.c
@@ -21,12 +21,6 @@
 #include "ucontext.h"
 #endif
 
-/* lower this if you want to reduce the memory consumption  */
-#ifndef CONTEXT_STACK_SIZE      /* allow lua to override this */
-#define CONTEXT_STACK_SIZE 128*1024
-#endif                          /*CONTEXT_STACK_SIZE */
-
-
 typedef char * raw_stack_t;
 typedef void (*rawctx_entry_point_t)(void *);
 
@@ -189,15 +183,15 @@ smx_ctx_raw_create_context(xbt_main_func_t code, int argc, char **argv,
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
      if (code) {
-       context->malloced_stack = xbt_malloc0(CONTEXT_STACK_SIZE);
+       context->malloced_stack = xbt_malloc0(smx_context_stack_size);
        context->stack_top =
-           raw_makecontext(context->malloced_stack,CONTEXT_STACK_SIZE,
+           raw_makecontext(context->malloced_stack, smx_context_stack_size,
                (void(*)(void*))smx_ctx_raw_wrapper,context);
 
 #ifdef HAVE_VALGRIND_VALGRIND_H
        context->valgrind_stack_id =
            VALGRIND_STACK_REGISTER(context->malloced_stack,
-               context->malloced_stack + CONTEXT_STACK_SIZE);
+               context->malloced_stack + smx_context_stack_size);
 #endif                          /* HAVE_VALGRIND_VALGRIND_H */
 
      }else{
@@ -217,6 +211,7 @@ static void smx_ctx_raw_free(smx_context_t context)
         context)->valgrind_stack_id);
 #endif                          /* HAVE_VALGRIND_VALGRIND_H */
 
+    free(((smx_ctx_raw_t)context)->malloced_stack);
   }
   smx_ctx_base_free(context);
 }
@@ -275,7 +270,7 @@ static void smx_ctx_raw_resume_parallel(smx_process_t process)
 static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
 {
   xbt_parmap_apply(parmap, (void_f_pvoid_t)smx_ctx_raw_resume_parallel, processes);
-    xbt_dynar_reset(processes);
+  xbt_dynar_reset(processes);
 }
 
 static smx_context_t smx_ctx_raw_self_parallel(void)
@@ -297,7 +292,7 @@ void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory)
   (*factory)->suspend = smx_ctx_raw_suspend;
   (*factory)->name = "smx_raw_context_factory";
 
-  if(_surf_parallel_contexts){
+  if (smx_parallel_contexts) {
 #ifdef CONTEXT_THREADS  /* To use parallel ucontexts a thread pool is needed */
     parmap = xbt_parmap_new(2);
     (*factory)->runall = smx_ctx_raw_runall_parallel;