/* 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
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;
/**
* This function is called by SIMIX_global_init() to initialize the context module.
*
* \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
}
* \return how threads are synchronized if processes are run in parallel
*/
XBT_INLINE e_xbt_parmap_mode_t SIMIX_context_get_parallel_mode(void) {
- return smx_parallel_synchronization_mode;
+ e_xbt_parmap_mode_t mode = XBT_PARMAP_FUTEX;
+ const char* mode_name = xbt_cfg_get_string(_surf_cfg_set, "contexts/synchro");
+ if (!strcmp(mode_name, "posix")) {
+ mode = XBT_PARMAP_POSIX;
+ }
+ else if (!strcmp(mode_name, "futex")) {
+ mode = XBT_PARMAP_FUTEX;
+ }
+ else if (!strcmp(mode_name, "busy_wait")) {
+ mode = XBT_PARMAP_BUSY_WAIT;
+ }
+ else {
+ XBT_WARN("Command line setting of the parallel synchronization mode should "
+ "be one of \"posix\", \"futex\" or \"busy_wait\"");
+ }
+ return mode;
}
/**
* \param mode how to synchronize threads if processes are run in parallel
*/
XBT_INLINE void SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode) {
- smx_parallel_synchronization_mode = mode;
+ if (mode == XBT_PARMAP_POSIX) {
+ xbt_cfg_set_string(_surf_cfg_set, "contexts/synchro", "posix");
+ }
+ else if (mode == XBT_PARMAP_FUTEX) {
+ xbt_cfg_set_string(_surf_cfg_set, "contexts/synchro", "futex");
+ }
+ else if (XBT_PARMAP_BUSY_WAIT) {
+ xbt_cfg_set_string(_surf_cfg_set, "contexts/synchro", "busy_wait");
+ }
+ else {
+ XBT_WARN("Command line setting of the parallel synchronization mode should "
+ "be one of \"posix\", \"futex\" or \"busy_wait\"");
+ }
}
/**