/* 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
#include "xbt/log.h"
#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
-#include "src/simix/private.h"
-#include "simix/context.h"
+#include "smx_private.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;
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.
* 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(int nb_threads) {
- xbt_assert(nb_threads > 0, "Invalid number of parallel threads: %d", 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, "No thread support for parallel context execution");
+ THROWF(arg_error, 0, "The thread factory cannot be run in parallel");
#endif
}
-
+
smx_parallel_contexts = nb_threads;
}