#define _aligned_free __mingw_aligned_free
#endif //MINGW
-#ifdef HAVE_VALGRIND_VALGRIND_H
+#ifdef HAVE_VALGRIND_H
# include <valgrind/valgrind.h>
#endif
if (smx_context_guard_size > 0 && !MC_is_active()) {
-#if defined(_WIN32) || (PTH_STACKGROWTH != -1)
+#if !defined(PTH_STACKGROWTH) || (PTH_STACKGROWTH != -1)
static int warned_once = 0;
if (!warned_once) {
- XBT_WARN("Stack overflow protection is known to be broken on your system. Either you're on Windows or PTH_STACKGROWTH != -1 (current value is %d).",
- PTH_STACKGROWTH);
+ XBT_WARN("Stack overflow protection is known to be broken on your system. Either stack grows upwards, or it was not even tested properly.");
warned_once = 1;
}
#endif
size_t size = smx_context_stack_size + smx_context_guard_size;
-#ifdef HAVE_MC
+#if HAVE_MC
/* Cannot use posix_memalign when HAVE_MC. Align stack by hand, and save the
* pointer returned by xbt_malloc0. */
char *alloc = (char*)xbt_malloc0(size + xbt_pagesize);
stack = xbt_malloc0(smx_context_stack_size);
}
-#ifdef HAVE_VALGRIND_VALGRIND_H
+#ifdef HAVE_VALGRIND_H
unsigned int valgrind_stack_id = VALGRIND_STACK_REGISTER(stack, (char *)stack + smx_context_stack_size);
memcpy((char *)stack + smx_context_usable_stack_size, &valgrind_stack_id, sizeof valgrind_stack_id);
#endif
if (!stack)
return;
-#ifdef HAVE_VALGRIND_VALGRIND_H
+#ifdef HAVE_VALGRIND_H
unsigned int valgrind_stack_id;
memcpy(&valgrind_stack_id, (char *)stack + smx_context_usable_stack_size, sizeof valgrind_stack_id);
VALGRIND_STACK_DEREGISTER(valgrind_stack_id);
XBT_WARN("Failed to remove page protection: %s", strerror(errno));
/* try to pursue anyway */
}
-#ifdef HAVE_MC
+#if HAVE_MC
/* Retrieve the saved pointer. See SIMIX_context_stack_new above. */
stack = *((void **)stack - 1);
#endif
nb_threads = xbt_os_get_numcores();
XBT_INFO("Auto-setting contexts/nthreads to %d",nb_threads);
}
-
- if (nb_threads > 1) {
#ifndef HAVE_THREAD_CONTEXTS
- THROWF(arg_error, 0, "The thread factory cannot be run in parallel");
+ xbt_assert(nb_threads == 1, "Parallel runs are impossible when the pthreads are missing.");
#endif
- }
smx_parallel_contexts = nb_threads;
}