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
verbose message about the type of context factory activated
[simgrid.git]
/
src
/
simix
/
smx_context.c
diff --git
a/src/simix/smx_context.c
b/src/simix/smx_context.c
index
e15fbfc
..
857c049
100644
(file)
--- a/
src/simix/smx_context.c
+++ b/
src/simix/smx_context.c
@@
-10,7
+10,7
@@
#include "xbt/log.h"
#include "xbt/swag.h"
#include "private.h"
#include "xbt/log.h"
#include "xbt/swag.h"
#include "private.h"
-#include "simix/
smx_context_private
.h"
+#include "simix/
context
.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
"Context switching mecanism");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
"Context switching mecanism");
@@
-28,10
+28,10
@@
void SIMIX_context_mod_init(void)
(*factory_initializer_to_use)(&(simix_global->context_factory));
}
else {
(*factory_initializer_to_use)(&(simix_global->context_factory));
}
else {
-#ifdef CONTEXT_THREADS /* Use os threads (either pthreads or windows ones) */
- SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
-#elif defined(CONTEXT_UCONTEXT) /* use ucontext */
+#ifdef CONTEXT_UCONTEXT /* use ucontext */
SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
+#elif defined(CONTEXT_THREADS) /* Use os threads (either pthreads or windows ones) */
+ SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
#else
#error ERROR [__FILE__, line __LINE__]: no context implementation specified.
#endif
#else
#error ERROR [__FILE__, line __LINE__]: no context implementation specified.
#endif