X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92082e43c0747a8ccf356348f00334de7f0cdb61..ed5a340afeaa90fd0964b0fae5e538496433d2ec:/src/simix/smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 01de34bd8f..39d77bda01 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -10,7 +10,7 @@
 #include "xbt/log.h"
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
-#include "src/simix/private.h"
+#include "smx_private.h"
 #include "simix/context.h"
 #include "gras_config.h"
 
@@ -132,30 +132,24 @@ XBT_INLINE int SIMIX_context_get_nthreads(void) {
  * for the user contexts.
  *
  * This function should be called before initializing SIMIX.
- * A value of 1 means no parallelism.
+ * A value of 1 means no parallelism (1 thread only).
  * If the value is greater than 1, the thread support must be enabled.
  *
  * \param nb_threads the number of threads to use
  */
-XBT_INLINE void SIMIX_context_set_nthreads(char* str_nb_threads) {
-
-  int nb_threads;
-
-  if(!strcmp(str_nb_threads,"auto")){
-      nb_threads = PROCESSOR_COUNT;
-      XBT_DEBUG("Auto-setting threads to %d",nb_threads);
-  }
-  else
-    nb_threads = atoi(str_nb_threads);
-
-  xbt_assert(nb_threads > 0, "Invalid number of parallel threads: %d", nb_threads);
+XBT_INLINE void SIMIX_context_set_nthreads(int nb_threads) {
 
+  if (nb_threads<=0) {	
+     nb_threads = xbt_os_get_numcores();
+     XBT_INFO("Auto-setting contexts/nthreads to %d",nb_threads);
+  }   
+	
   if (nb_threads > 1) {
 #ifndef CONTEXT_THREADS
     THROWF(arg_error, 0, "The thread factory cannot be run in parallel");
 #endif
   }
-
+ 
   smx_parallel_contexts = nb_threads;
 }