}
else { /* use the factory specified by --cfg=contexts/factory:value */
- if (smx_context_factory_name == NULL ||
- !strcmp(smx_context_factory_name, "default")) {
- /* use the default factory */
- #ifdef HAVE_RAWCTX
- SIMIX_ctx_raw_factory_init(&simix_global->context_factory);
- #elif CONTEXT_UCONTEXT
- SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
- #else
- SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
- #endif
- }
- else if (!strcmp(smx_context_factory_name, "ucontext")) {
- /* use ucontext */
+
+ if (!strcmp(smx_context_factory_name, "thread")) {
+ /* use os threads (either pthreads or windows ones) */
+ SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
+ }
#ifdef CONTEXT_UCONTEXT
+ else if (!strcmp(smx_context_factory_name, "ucontext")) {
+ /* use ucontext */
SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
-#else
- xbt_die("The context factory 'ucontext' unavailable on your system");
-#endif
- }
- else if (!strcmp(smx_context_factory_name, "thread")) {
- /* use os threads (either pthreads or windows ones) */
- SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
}
+#endif
+#ifdef HAVE_RAWCTX
else if (!strcmp(smx_context_factory_name, "raw")) {
- /* use raw contexts */
- SIMIX_ctx_raw_factory_init(&simix_global->context_factory);
+ /* use raw contexts */
+ SIMIX_ctx_raw_factory_init(&simix_global->context_factory);
}
+#endif
else {
XBT_ERROR("Invalid context factory specified. Valid factories on this machine:");
#ifdef HAVE_RAWCTX