X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a27ac26be2bca7926f72eed979ba6552d25f0ddc..891abf1a3579d0e378a6e1b3426e5c34b23a58ad:/src/simix/smx_context.cpp diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp index 0a528a0e79..3e46ecec03 100644 --- 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 "smx_private.hpp" #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 context_factories[] = { #if HAVE_RAW_CONTEXTS - { "raw", simgrid::simix::raw_factory }, + { "raw", &simgrid::simix::raw_factory }, #endif #if HAVE_UCONTEXT_CONTEXTS - { "ucontext", simgrid::simix::sysv_factory }, + { "ucontext", &simgrid::simix::sysv_factory }, #endif #if HAVE_BOOST_CONTEXTS - { "boost", simgrid::simix::boost_factory }, + { "boost", &simgrid::simix::boost_factory }, #endif #if HAVE_THREAD_CONTEXTS - { "thread", simgrid::simix::thread_factory }, + { "thread", &simgrid::simix::thread_factory }, #endif }; @@ -65,7 +64,6 @@ std::string contexts_list() { std::string res; const std::size_t n = sizeof(context_factories) / sizeof(context_factories[0]); - std::size_t i = 0; for (std::size_t i = 1; i != n; ++i) { res += ", "; res += context_factories[i].first; @@ -128,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 (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; } @@ -237,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) {