Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Add configuration auto for contexts/nthreads and use the PROCESSOR_COUNT.
[simgrid.git] / src / simix / smx_context.c
index 1170709..94746b7 100644 (file)
@@ -18,7 +18,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
                                 "Context switching mecanism");
 
 char* smx_context_factory_name = NULL; /* factory name specified by --cfg=contexts/factory:value */
-XBT_PUBLIC(smx_ctx_factory_initializer_t) smx_factory_initializer_to_use = NULL;
+smx_ctx_factory_initializer_t smx_factory_initializer_to_use = NULL;
 int smx_context_stack_size = 128 * 1024;
 
 #ifdef HAVE_THREAD_LOCAL_STORAGE
@@ -136,7 +136,16 @@ 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);