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
Add msg host on/off test
[simgrid.git]
/
src
/
simix
/
smx_context.c
diff --git
a/src/simix/smx_context.c
b/src/simix/smx_context.c
index
88c5a4f
..
214ea71
100644
(file)
--- a/
src/simix/smx_context.c
+++ b/
src/simix/smx_context.c
@@
-1,6
+1,6
@@
/* a fast and simple context switching library */
/* a fast and simple context switching library */
-/* Copyright (c) 2009-201
3
. The SimGrid Team.
+/* Copyright (c) 2009-201
4
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-70,10
+70,10
@@
void SIMIX_context_mod_init(void)
#ifdef HAVE_RAWCTX
XBT_ERROR(" raw: high performance context factory implemented specifically for SimGrid");
#else
#ifdef HAVE_RAWCTX
XBT_ERROR(" raw: high performance context factory implemented specifically for SimGrid");
#else
- XBT_ERROR(" (raw context
e
s are disabled at compilation time on this machine -- check configure logs for details)");
+ XBT_ERROR(" (raw contexts are disabled at compilation time on this machine -- check configure logs for details)");
#endif
#ifdef CONTEXT_UCONTEXT
#endif
#ifdef CONTEXT_UCONTEXT
- XBT_ERROR(" ucontext: classical system V context
e
s (implemented with makecontext, swapcontext and friends)");
+ XBT_ERROR(" ucontext: classical system V contexts (implemented with makecontext, swapcontext and friends)");
#else
XBT_ERROR(" (ucontext is disabled at compilation time on this machine -- check configure logs for details)");
#endif
#else
XBT_ERROR(" (ucontext is disabled at compilation time on this machine -- check configure logs for details)");
#endif
@@
-127,7
+127,7
@@
XBT_INLINE int SIMIX_context_get_nthreads(void) {
*
* \param nb_threads the number of threads to use
*/
*
* \param nb_threads the number of threads to use
*/
-
XBT_INLINE
void SIMIX_context_set_nthreads(int nb_threads) {
+void SIMIX_context_set_nthreads(int nb_threads) {
if (nb_threads<=0) {
nb_threads = xbt_os_get_numcores();
XBT_INFO("Auto-setting contexts/nthreads to %d",nb_threads);
if (nb_threads<=0) {
nb_threads = xbt_os_get_numcores();
XBT_INFO("Auto-setting contexts/nthreads to %d",nb_threads);
@@
-220,4
+220,3
@@
XBT_INLINE void SIMIX_context_set_current(smx_context_t context)
smx_current_context_serial = context;
}
}
smx_current_context_serial = context;
}
}
-