void SerialBoostContext::resume()
{
+ BoostContext* old = static_cast<BoostContext*>(self());
Context::set_current(this);
- BoostContext::swap(BoostContext::get_maestro(), this);
+ BoostContext::swap(old, this);
}
void SerialBoostContext::run_all()
void SerialRawContext::resume()
{
+ RawContext* old = static_cast<RawContext*>(self());
Context::set_current(this);
- RawContext::swap(RawContext::get_maestro(), this);
+ RawContext::swap(old, this);
}
void SerialRawContext::run_all()
--- /dev/null
+/* Copyright (c) 2009-2018. 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 "src/kernel/context/context_private.hpp"
+#include "src/simix/ActorImpl.hpp"
+#include "src/simix/smx_private.hpp"
+
+#include "ContextSwapped.hpp"
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
+
+namespace simgrid {
+namespace kernel {
+namespace context {
+
+unsigned long SwappedContext::process_index_;
+
+SwappedContext* SwappedContext::maestro_context_ = nullptr;
+
+void SwappedContext::suspend()
+{
+ /* determine the next context */
+ SwappedContext* next_context;
+ unsigned long int i = process_index_;
+ process_index_++;
+
+ if (i < simix_global->process_to_run.size()) {
+ /* execute the next process */
+ XBT_DEBUG("Run next process");
+ next_context = static_cast<SwappedContext*>(simix_global->process_to_run[i]->context_);
+ } else {
+ /* all processes were run, return to maestro */
+ XBT_DEBUG("No more process to run");
+ next_context = static_cast<SwappedContext*>(get_maestro());
+ }
+ Context::set_current(next_context);
+ this->swap_into(next_context);
+}
+
+void SwappedContext::resume()
+{
+ SwappedContext* old = static_cast<SwappedContext*>(self());
+ Context::set_current(this);
+ old->swap_into(this);
+}
+
+void SwappedContext::run_all()
+{
+ if (simix_global->process_to_run.empty())
+ return;
+ smx_actor_t first_process = simix_global->process_to_run.front();
+ process_index_ = 1;
+ /* execute the first process */
+ static_cast<SwappedContext*>(first_process->context_)->resume();
+}
+} // namespace context
+} // namespace kernel
+} // namespace simgrid
--- /dev/null
+/* Copyright (c) 2009-2018. 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. */
+
+#ifndef SIMGRID_SIMIX_SWAPPED_CONTEXT_HPP
+#define SIMGRID_SIMIX_SWAPPED_CONTEXT_HPP
+
+#include "Context.hpp"
+
+namespace simgrid {
+namespace kernel {
+namespace context {
+
+class SwappedContext : public Context {
+public:
+ SwappedContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
+ : Context(std::move(code), cleanup_func, process)
+ {
+ }
+ virtual void suspend();
+ virtual void resume();
+
+ static void run_all();
+
+ virtual void swap_into(SwappedContext* to) = 0;
+
+ static SwappedContext* get_maestro() { return maestro_context_; }
+ static void set_maestro(SwappedContext* maestro) { maestro_context_ = maestro; }
+
+private:
+ static unsigned long process_index_;
+ static SwappedContext* maestro_context_;
+};
+
+} // namespace context
+} // namespace kernel
+} // namespace simgrid
+#endif
#include "simgrid/Exception.hpp"
#include "src/mc/mc_ignore.hpp"
#include "src/simix/ActorImpl.hpp"
+#include "src/simix/smx_private.hpp"
#include "ContextUnix.hpp"
if (parallel_)
return new_context<ParallelUContext>(std::move(code), cleanup, process);
else
- return new_context<SerialUContext>(std::move(code), cleanup, process);
+ return new_context<UContext>(std::move(code), cleanup, process);
}
/* This function is called by maestro at the beginning of a scheduling round to get all working threads executing some
if (parallel_)
ParallelUContext::run_all();
else
- SerialUContext::run_all();
+ SwappedContext::run_all();
}
// UContext
-UContext* UContext::maestro_context_ = nullptr;
-
UContext::UContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
- : Context(std::move(code), cleanup_func, process)
+ : SwappedContext(std::move(code), cleanup_func, process)
{
/* if the user provided a function for the process then use it, otherwise it is the context for maestro */
if (has_code()) {
#endif
UContext::make_ctx(&this->uc_, UContext::smx_ctx_sysv_wrapper, this);
} else {
- if (process != nullptr && maestro_context_ == nullptr)
- maestro_context_ = this;
+ if (process != nullptr && get_maestro() == nullptr)
+ set_maestro(this);
}
#if SIMGRID_HAVE_MC
makecontext(ucp, (void (*)())func, 2, ctx_addr[0], ctx_addr[1]);
}
-inline void UContext::swap(UContext* from, UContext* to)
+void UContext::swap_into(SwappedContext* to_)
{
+ UContext* to = static_cast<UContext*>(to_);
ASAN_ONLY(void* fake_stack = nullptr);
ASAN_ONLY(to->asan_ctx_ = from);
ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_);
- swapcontext(&from->uc_, &to->uc_);
+ swapcontext(&this->uc_, &to->uc_);
ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_);
}
throw StopRequest();
}
-// SerialUContext
-
-unsigned long SerialUContext::process_index_; /* index of the next process to run in the list of runnable processes */
-
-void SerialUContext::suspend()
-{
- /* determine the next context */
- SerialUContext* next_context;
- unsigned long int i = process_index_;
- process_index_++;
-
- if (i < simix_global->process_to_run.size()) {
- /* execute the next process */
- XBT_DEBUG("Run next process");
- next_context = static_cast<SerialUContext*>(simix_global->process_to_run[i]->context_);
- } else {
- /* all processes were run, return to maestro */
- XBT_DEBUG("No more process to run");
- next_context = static_cast<SerialUContext*>(UContext::get_maestro());
- }
- Context::set_current(next_context);
- UContext::swap(this, next_context);
-}
-
-void SerialUContext::resume()
-{
- Context::set_current(this);
- UContext::swap(UContext::get_maestro(), this);
-}
-
-void SerialUContext::run_all()
-{
- if (simix_global->process_to_run.empty())
- return;
- smx_actor_t first_process = simix_global->process_to_run.front();
- process_index_ = 1;
- static_cast<SerialUContext*>(first_process->context_)->resume();
-}
-
// ParallelUContext
simgrid::xbt::Parmap<smx_actor_t>* ParallelUContext::parmap_;
Context::set_current(next_context);
// Get the next soul to run, either simulated or initial minion's one:
- UContext::swap(this, next_context);
+ this->swap_into(next_context);
}
/** Run one particular simulated process on the current thread. */
// Write in simix that I switched my soul
Context::set_current(this);
// Actually do that using the relevant library call:
- UContext::swap(worker_context, this);
+ worker_context->swap_into(this);
// No body runs that soul anymore at this point. Instead the current body took the soul of simulated process The
// simulated process wakes back after the call to "SIMIX_context_suspend(self->context);" within
// smx_process.c::SIMIX_process_yield()
#include <xbt/parmap.hpp>
#include <xbt/xbt_os_thread.h>
-#include "Context.hpp"
#include "src/internal_config.h"
-#include "src/simix/smx_private.hpp"
+#include "src/kernel/context/ContextSwapped.hpp"
namespace simgrid {
namespace kernel {
namespace context {
-class UContext : public Context {
+class UContext : public SwappedContext {
public:
UContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
~UContext() override;
void stop() override;
- virtual void resume() = 0;
- static void swap(UContext* from, UContext* to);
- static UContext* get_maestro() { return maestro_context_; }
- static void set_maestro(UContext* maestro) { maestro_context_ = maestro; }
+ void swap_into(SwappedContext* to) override;
private:
- static UContext* maestro_context_;
void* stack_ = nullptr; /* the thread stack */
ucontext_t uc_; /* the ucontext that executes the code */
static void make_ctx(ucontext_t* ucp, void (*func)(int, int), UContext* arg);
};
-class SerialUContext : public UContext {
-public:
- SerialUContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
- : UContext(std::move(code), cleanup_func, process)
- {
- }
- void suspend() override;
- void resume() override;
-
- static void run_all();
-
-private:
- static unsigned long process_index_;
-};
-
class ParallelUContext : public UContext {
public:
ParallelUContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
src/kernel/context/Context.hpp
src/kernel/context/ContextRaw.cpp
src/kernel/context/ContextRaw.hpp
+ src/kernel/context/ContextSwapped.cpp
+ src/kernel/context/ContextSwapped.hpp
src/kernel/context/ContextThread.cpp
src/kernel/context/ContextThread.hpp
src/simix/smx_deployment.cpp