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
[s4u] Add ConditionVariable::wait(lock, predicate)
[simgrid.git]
/
src
/
simix
/
smx_context.cpp
diff --git
a/src/simix/smx_context.cpp
b/src/simix/smx_context.cpp
index 7607f844b441be20bce1f180199e22976010aa62..3e46ecec03586c7ce59450f3517ca03a2341a850 100644
(file)
--- a/
src/simix/smx_context.cpp
+++ b/
src/simix/smx_context.cpp
@@
-17,7
+17,6
@@
#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
#include "smx_private.h"
#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
#include "smx_private.h"
-#include "smx_private.hpp"
#include "simgrid/sg_config.h"
#include "src/internal_config.h"
#include "simgrid/modelchecker.h"
#include "simgrid/sg_config.h"
#include "src/internal_config.h"
#include "simgrid/modelchecker.h"
@@
-43,16
+42,16
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix, "Context switching mechani
static std::pair<const char*, simgrid::simix::ContextFactoryInitializer> context_factories[] = {
#if HAVE_RAW_CONTEXTS
static std::pair<const char*, simgrid::simix::ContextFactoryInitializer> context_factories[] = {
#if HAVE_RAW_CONTEXTS
- { "raw", simgrid::simix::raw_factory },
+ { "raw",
&
simgrid::simix::raw_factory },
#endif
#if HAVE_UCONTEXT_CONTEXTS
#endif
#if HAVE_UCONTEXT_CONTEXTS
- { "ucontext", simgrid::simix::sysv_factory },
+ { "ucontext",
&
simgrid::simix::sysv_factory },
#endif
#if HAVE_BOOST_CONTEXTS
#endif
#if HAVE_BOOST_CONTEXTS
- { "boost", simgrid::simix::boost_factory },
+ { "boost",
&
simgrid::simix::boost_factory },
#endif
#if HAVE_THREAD_CONTEXTS
#endif
#if HAVE_THREAD_CONTEXTS
- { "thread", simgrid::simix::thread_factory },
+ { "thread",
&
simgrid::simix::thread_factory },
#endif
};
#endif
};
@@
-127,7
+126,7
@@
void SIMIX_context_mod_init(void)
if (simix_global->context_factory)
return;
/* select the context factory to use to create the contexts */
if (simix_global->context_factory)
return;
/* select the context factory to use to create the contexts */
- if (simgrid::simix::factory_initializer) {
+ if (simgrid::simix::factory_initializer) {
// Give Java a chance to hijack the factory mechanism
simix_global->context_factory = simgrid::simix::factory_initializer();
return;
}
simix_global->context_factory = simgrid::simix::factory_initializer();
return;
}
@@
-236,8
+235,7
@@
int SIMIX_context_is_parallel(void) {
}
/**
}
/**
- * \brief Returns the number of parallel threads used
- * for the user contexts.
+ * @brief Returns the number of parallel threads used for the user contexts.
* \return the number of threads (1 means no parallelism)
*/
int SIMIX_context_get_nthreads(void) {
* \return the number of threads (1 means no parallelism)
*/
int SIMIX_context_get_nthreads(void) {