-/* 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 <math.h>
+#include "src/internal_config.h"
-#include <utility>
-#include <functional>
+#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);
/** @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:
// ***** Loads of static stuff
#if HAVE_THREAD_CONTEXTS
-static xbt_parmap_t raw_parmap;
+static simgrid::xbt::Parmap<smx_actor_t>* 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 */
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
}
void RawContext::wrapper(void* arg)
{
RawContext* context = static_cast<RawContext*>(arg);
- (*context)();
- context->stop();
+ try {
+ (*context)();
+ context->Context::stop();
+ } catch (StopRequest const&) {
+ XBT_DEBUG("Caught a StopRequest");
+ }
+ context->suspend();
}
RawContext::RawContext(std::function<void()> code,
void RawContext::stop()
{
Context::stop();
- this->suspend();
+ throw StopRequest();
}
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<RawContext*>(first_process->context)->resume_serial();
}
#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<smx_actor_t>(arg);
+ raw_parmap = new simgrid::xbt::Parmap<smx_actor_t>(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode());
+ raw_parmap->apply(
+ [](smx_actor_t process) {
RawContext* context = static_cast<RawContext*>(process->context);
context->resume_parallel();
},
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<RawContext*>(xbt_dynar_get_as(simix_global->process_to_run, i, smx_actor_t)->context);
+ next_context = static_cast<RawContext*>(simix_global->process_to_run[i]->context);
} else {
/* all processes were run, return to maestro */
XBT_DEBUG("No more process to run");
{
#if HAVE_THREAD_CONTEXTS
/* determine the next context */
- smx_actor_t next_work = static_cast<smx_actor_t>(xbt_parmap_next(raw_parmap));
- RawContext* next_context = nullptr;
-
- if (next_work != nullptr) {
+ boost::optional<smx_actor_t> 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<RawContext*>(next_work->context);
+ next_context = static_cast<RawContext*>(next_work.get()->context);
} else {
/* all processes were run, go to the barrier */
XBT_DEBUG("No more processes to run");
/** @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<unsigned long>(SIMIX_context_get_parallel_threshold()) < nb_processes) {
raw_context_parallel = true;
