Revert "Use xbt_config mechanism instead of hard coding value."

[simgrid.git] / src / simix / smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 6423cd6..01de34b 100644 (file)
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -1,6 +1,6 @@
 /* a fast and simple context switching library                              */
 
-/* Copyright (c) 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2009 - 2011. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -137,13 +137,22 @@ XBT_INLINE int SIMIX_context_get_nthreads(void) {
  *
  * \param nb_threads the number of threads to use
  */
-XBT_INLINE void SIMIX_context_set_nthreads(int nb_threads) {
+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);
 
   if (nb_threads > 1) {
 #ifndef CONTEXT_THREADS
-    THROWF(arg_error, 0, "No thread support for parallel context execution");
+    THROWF(arg_error, 0, "The thread factory cannot be run in parallel");
 #endif
   }