A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
smpi/privatization is not the concern of smx_context
[simgrid.git]
/
src
/
simix
/
smx_context.cpp
diff --git
a/src/simix/smx_context.cpp
b/src/simix/smx_context.cpp
index
b9911d1
..
85c6c0a
100644
(file)
--- a/
src/simix/smx_context.cpp
+++ b/
src/simix/smx_context.cpp
@@
-16,15
+16,12
@@
#include <xbt/range.hpp>
#include <xbt/sysdep.h>
#include <xbt/range.hpp>
#include <xbt/sysdep.h>
+#include "simgrid/modelchecker.h"
+#include "simgrid/sg_config.h"
+#include "smx_private.hpp"
#include "src/internal_config.h"
#include "xbt/log.h"
#include "src/internal_config.h"
#include "xbt/log.h"
-#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
#include "xbt/xbt_os_thread.h"
-#include "smx_private.h"
-#include "simgrid/sg_config.h"
-#include "src/internal_config.h"
-#include "simgrid/modelchecker.h"
-
#ifdef _WIN32
#include <windows.h>
#ifdef _WIN32
#include <windows.h>
@@
-33,10
+30,10
@@
#include <sys/mman.h>
#endif
#include <sys/mman.h>
#endif
-#ifdef __MINGW32__
-#define _aligned_malloc __mingw_aligned_malloc
-#define _aligned_free __mingw_aligned_free
-#endif /
/MINGW
+#ifdef __MINGW32__
+#define _aligned_malloc __mingw_aligned_malloc
+#define _aligned_free __mingw_aligned_free
+#endif /
*MINGW*/
#if HAVE_VALGRIND_H
# include <valgrind/valgrind.h>
#if HAVE_VALGRIND_H
# include <valgrind/valgrind.h>
@@
-79,9
+76,9
@@
static simgrid::config::Flag<std::string> context_factory_name(
(std::string("Possible values: ")+contexts_list()).c_str(),
context_factories[0].first);
(std::string("Possible values: ")+contexts_list()).c_str(),
context_factories[0].first);
-
int
smx_context_stack_size;
+
unsigned
smx_context_stack_size;
int smx_context_stack_size_was_set = 0;
int smx_context_stack_size_was_set = 0;
-
int
smx_context_guard_size;
+
unsigned
smx_context_guard_size;
int smx_context_guard_size_was_set = 0;
#if HAVE_THREAD_LOCAL_STORAGE
static XBT_THREAD_LOCAL smx_context_t smx_current_context_parallel;
int smx_context_guard_size_was_set = 0;
#if HAVE_THREAD_LOCAL_STORAGE
static XBT_THREAD_LOCAL smx_context_t smx_current_context_parallel;
@@
-107,14
+104,15
@@
void SIMIX_context_mod_init()
#endif
#if defined(__APPLE__) || defined(__NetBSD__)
#endif
#if defined(__APPLE__) || defined(__NetBSD__)
- if (context_factory_name == std::string("thread") &&
-
strcmp(xbt_cfg_get_string("smpi/privatization"), "dlopen") == 0
) {
+ std::string priv = xbt_cfg_get_string("smpi/privatization");
+
if (context_factory_name == "thread" && (priv == "dlopen" || priv == "yes" || priv == "default" || priv == "1")
) {
XBT_WARN("dlopen+thread broken on Apple and BSD. Switching to raw contexts.");
context_factory_name = "raw";
}
#endif
XBT_WARN("dlopen+thread broken on Apple and BSD. Switching to raw contexts.");
context_factory_name = "raw";
}
#endif
+
#if defined(__FreeBSD__)
#if defined(__FreeBSD__)
- if (context_factory_name ==
std::string("thread") && strcmp(xbt_cfg_get_string("smpi/privatization"), "no") != 0)
{
+ if (context_factory_name ==
"thread" && xbt_cfg_get_string("smpi/privatization") != "no")
{
XBT_WARN("mmap broken on FreeBSD, but dlopen+thread broken too. Switching to dlopen+raw contexts.");
context_factory_name = "raw";
}
XBT_WARN("mmap broken on FreeBSD, but dlopen+thread broken too. Switching to dlopen+raw contexts.");
context_factory_name = "raw";
}
@@
-271,7
+269,7
@@
int SIMIX_context_get_nthreads() {
* \param nb_threads the number of threads to use
*/
void SIMIX_context_set_nthreads(int nb_threads) {
* \param nb_threads the number of threads to use
*/
void SIMIX_context_set_nthreads(int nb_threads) {
- if (nb_threads<=0) {
+ if (nb_threads<=0) {
nb_threads = xbt_os_get_numcores();
XBT_INFO("Auto-setting contexts/nthreads to %d",nb_threads);
}
nb_threads = xbt_os_get_numcores();
XBT_INFO("Auto-setting contexts/nthreads to %d",nb_threads);
}