X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ba332d836bc04ad37d97dad2e21104073bb8bf5..3834d39dda746e4a706fc82ba24cde755fa8775c:/src/simix/smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 39d77bda01..9273ab1381 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -11,11 +11,10 @@
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
 #include "smx_private.h"
-#include "simix/context.h"
 #include "gras_config.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
-                                "Context switching mecanism");
+                                "Context switching mechanism");
 
 char* smx_context_factory_name = NULL; /* factory name specified by --cfg=contexts/factory:value */
 smx_ctx_factory_initializer_t smx_factory_initializer_to_use = NULL;
@@ -29,7 +28,7 @@ static xbt_os_thread_key_t smx_current_context_key = 0;
 static smx_context_t smx_current_context_serial;
 static int smx_parallel_contexts = 1;
 static int smx_parallel_threshold = 2;
-static e_xbt_parmap_mode_t smx_parallel_synchronization_mode = XBT_PARMAP_FUTEX;
+static e_xbt_parmap_mode_t smx_parallel_synchronization_mode = XBT_PARMAP_DEFAULT;
 
 /** 
  * This function is called by SIMIX_global_init() to initialize the context module.