/* 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 "simgrid/Exception.hpp"
#include "simgrid/modelchecker.h"
#include "src/internal_config.h"
#include "src/kernel/context/context_private.hpp"
delete parmap_;
}
-SwappedContext::SwappedContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
- SwappedContextFactory* factory)
- : Context(std::move(code), cleanup_func, process), factory_(factory)
+SwappedContext::SwappedContext(std::function<void()> code, smx_actor_t actor, SwappedContextFactory* factory)
+ : Context(std::move(code), actor), factory_(factory)
{
// Save maestro (=context created first) in preparation for run_all
if (not factory->parallel_ && factory_->workers_context_[0] == nullptr)
{
Context::stop();
/* We must cut the actor execution using an exception to properly free the C++ RAII variables */
- throw StopRequest();
+ throw ForcefulKillException();
}
/** Maestro wants to run all ready actors */
Context::set_current(this);
worker_context->swap_into(this);
// No body runs that soul anymore at this point, but it is stored in a safe place.
- // When the executed actor will do a blocking action, SIMIX_process_yield() will call suspend(), below.
+ // When the executed actor will do a blocking action, ActorImpl::yield() will call suspend(), below.
} else { // sequential execution
SwappedContext* old = static_cast<SwappedContext*>(self());
Context::set_current(this);
}
}
-/** The actor wants to yield back to maestro, because it is blocked in a simcall (ie in SIMIX_process_yield())
+/** The actor wants to yield back to maestro, because it is blocked in a simcall (i.e., in ActorImpl::yield())
*
* Actually, it does not really yield back to maestro, but directly into the next executable actor.
*