X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/772fbe2c6395ac920d8e7907dc39749d458f02b6..1fc042e8bc9c51f9267fa1936deaebe59ae01ee7:/src/kernel/context/ContextRaw.cpp diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp index 8ad2f1116d..1df1de7fdb 100644 --- a/src/kernel/context/ContextRaw.cpp +++ b/src/kernel/context/ContextRaw.cpp @@ -1,22 +1,14 @@ -/* Copyright (c) 2009-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include +#include "src/internal_config.h" -#include -#include +#include "xbt/parmap.hpp" -#include "src/internal_config.h" - -#include "xbt/log.h" -#include "xbt/parmap.h" -#include "xbt/dynar.h" - -#include "src/simix/smx_private.h" #include "mc/mc.h" +#include "src/simix/smx_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); @@ -31,12 +23,12 @@ class RawContextFactory; /** @brief Fast context switching inspired from SystemV ucontexts. * - * The main difference to the System V context is that Raw Contexts are much faster because they don't + * The main difference to the System V context is that Raw Contexts are much faster because they don't * preserve the signal mask when switching. This saves a system call (at least on Linux) on each context switch. */ class RawContext : public Context { protected: - void* stack_ = nullptr; + void* stack_ = nullptr; /** pointer to top the stack stack */ void* stack_top_ = nullptr; public: @@ -81,7 +73,7 @@ ContextFactory* raw_factory() // ***** Loads of static stuff #if HAVE_THREAD_CONTEXTS -static xbt_parmap_t raw_parmap; +static simgrid::xbt::Parmap* raw_parmap; static simgrid::kernel::context::RawContext** raw_workers_context; /* space to save the worker context in each thread */ static uintptr_t raw_threads_working; /* number of threads that have started their work */ static xbt_os_thread_key_t raw_worker_id_key; /* thread-specific storage for the thread id */ @@ -278,15 +270,14 @@ RawContextFactory::RawContextFactory() raw_workers_context = xbt_new(RawContext*, nthreads); raw_maestro_context = nullptr; #endif - // TODO, if(SIMIX_context_get_parallel_threshold() > 1) => choose dynamically + // TODO: choose dynamically when SIMIX_context_get_parallel_threshold() > 1 } } RawContextFactory::~RawContextFactory() { #if HAVE_THREAD_CONTEXTS - if (raw_parmap) - xbt_parmap_destroy(raw_parmap); + delete raw_parmap; xbt_free(raw_workers_context); #endif } @@ -300,8 +291,13 @@ RawContext* RawContextFactory::create_context(std::function code, void RawContext::wrapper(void* arg) { RawContext* context = static_cast(arg); - (*context)(); - context->stop(); + try { + (*context)(); + context->Context::stop(); + } catch (StopRequest const&) { + XBT_DEBUG("Caught a StopRequest"); + } + context->suspend(); } RawContext::RawContext(std::function code, @@ -332,7 +328,7 @@ RawContext::~RawContext() void RawContext::stop() { Context::stop(); - this->suspend(); + throw StopRequest(); } void RawContextFactory::run_all() @@ -345,11 +341,10 @@ void RawContextFactory::run_all() void RawContextFactory::run_all_serial() { - if (xbt_dynar_is_empty(simix_global->process_to_run)) + if (simix_global->process_to_run.empty()) return; - smx_actor_t first_process = - xbt_dynar_get_as(simix_global->process_to_run, 0, smx_actor_t); + smx_actor_t first_process = simix_global->process_to_run.front(); raw_process_index = 1; static_cast(first_process->context)->resume_serial(); } @@ -359,11 +354,9 @@ void RawContextFactory::run_all_parallel() #if HAVE_THREAD_CONTEXTS raw_threads_working = 0; if (raw_parmap == nullptr) - raw_parmap = xbt_parmap_new( - SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode()); - xbt_parmap_apply(raw_parmap, - [](void* arg) { - smx_actor_t process = static_cast(arg); + raw_parmap = new simgrid::xbt::Parmap(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode()); + raw_parmap->apply( + [](smx_actor_t process) { RawContext* context = static_cast(process->context); context->resume_parallel(); }, @@ -387,10 +380,10 @@ void RawContext::suspend_serial() RawContext* next_context = nullptr; unsigned long int i = raw_process_index; raw_process_index++; - if (i < xbt_dynar_length(simix_global->process_to_run)) { + if (i < simix_global->process_to_run.size()) { /* execute the next process */ XBT_DEBUG("Run next process"); - next_context = static_cast(xbt_dynar_get_as(simix_global->process_to_run, i, smx_actor_t)->context); + next_context = static_cast(simix_global->process_to_run[i]->context); } else { /* all processes were run, return to maestro */ XBT_DEBUG("No more process to run"); @@ -404,13 +397,12 @@ void RawContext::suspend_parallel() { #if HAVE_THREAD_CONTEXTS /* determine the next context */ - smx_actor_t next_work = static_cast(xbt_parmap_next(raw_parmap)); - RawContext* next_context = nullptr; - - if (next_work != nullptr) { + boost::optional next_work = raw_parmap->next(); + RawContext* next_context; + if (next_work) { /* there is a next process to resume */ XBT_DEBUG("Run next process"); - next_context = static_cast(next_work->context); + next_context = static_cast(next_work.get()->context); } else { /* all processes were run, go to the barrier */ XBT_DEBUG("No more processes to run"); @@ -458,7 +450,7 @@ void RawContext::resume_parallel() /** @brief Resumes all processes ready to run. */ void RawContextFactory::run_all_adaptative() { - unsigned long nb_processes = xbt_dynar_length(simix_global->process_to_run); + unsigned long nb_processes = simix_global->process_to_run.size(); if (SIMIX_context_is_parallel() && static_cast(SIMIX_context_get_parallel_threshold()) < nb_processes) { raw_context_parallel = true;