#include <csignal>
#include <functional>
-/* Process creation/destruction callbacks */
-typedef void (*void_pfn_smxprocess_t)(smx_actor_t);
-
namespace simgrid {
namespace kernel {
namespace context {
class XBT_PUBLIC ContextFactory {
public:
explicit ContextFactory() {}
+ ContextFactory(const ContextFactory&) = delete;
+ ContextFactory& operator=(const ContextFactory&) = delete;
virtual ~ContextFactory();
- virtual Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) = 0;
+ virtual Context* create_context(std::function<void()>&& code, actor::ActorImpl* actor) = 0;
/** Turn the current thread into a simulation context */
- virtual Context* attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
+ virtual Context* attach(actor::ActorImpl* actor);
/** Turn the current thread into maestro (the old maestro becomes a regular actor) */
- virtual Context* create_maestro(std::function<void()> code, smx_actor_t process);
+ virtual Context* create_maestro(std::function<void()>&& code, actor::ActorImpl* actor);
virtual void run_all() = 0;
class XBT_PUBLIC Context {
friend ContextFactory;
-private:
std::function<void()> code_;
- void_pfn_smxprocess_t cleanup_func_ = nullptr;
- smx_actor_t actor_ = nullptr;
+ actor::ActorImpl* actor_ = nullptr;
void declare_context(std::size_t size);
public:
bool iwannadie = false;
- Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor);
+ Context(std::function<void()>&& code, actor::ActorImpl* actor);
Context(const Context&) = delete;
Context& operator=(const Context&) = delete;
virtual ~Context();
void operator()() { code_(); }
bool has_code() const { return static_cast<bool>(code_); }
- smx_actor_t get_actor() { return this->actor_; }
- void set_cleanup(void_pfn_smxprocess_t cleanup) { cleanup_func_ = cleanup; }
+ actor::ActorImpl* get_actor() { return this->actor_; }
// Scheduling methods
virtual void stop();
static Context* self();
/** @brief Sets the current context of this thread */
static void set_current(Context* self);
-
- class StopRequest {
- /** @brief Exception launched to kill a process, in order to properly unwind its stack and release RAII stuff
- *
- * Nope, Sonar, this should not inherit of std::exception nor of simgrid::Exception.
- * Otherwise, users may accidentally catch it with a try {} catch (std::exception)
- */
- public:
- StopRequest() = default;
- explicit StopRequest(std::string msg) : msg_(std::string("Actor killed (") + msg + std::string(").")) {}
- const char* what() const noexcept { return msg_.c_str(); }
-
- private:
- std::string msg_ = std::string("Actor killed.");
- };
};
class XBT_PUBLIC AttachContext : public Context {
public:
- AttachContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor)
- : Context(std::move(code), cleanup_func, actor)
- {
- }
-
+ AttachContext(std::function<void()>&& code, actor::ActorImpl* actor) : Context(std::move(code), actor) {}
+ AttachContext(const AttachContext&) = delete;
+ AttachContext& operator=(const AttachContext&) = delete;
~AttachContext() override;
/** Called by the context when it is ready to give control
virtual void attach_stop() = 0;
};
-XBT_PUBLIC void throw_stoprequest();
-XBT_PUBLIC bool try_n_catch_stoprequest(std::function<void(void)> try_block);
/* This allows Java to hijack the context factory (Java induces factories of factory :) */
typedef ContextFactory* (*ContextFactoryInitializer)();
XBT_PRIVATE ContextFactory* raw_factory();
XBT_PRIVATE ContextFactory* boost_factory();
-}}}
+} // namespace context
+} // namespace kernel
+} // namespace simgrid
typedef simgrid::kernel::context::ContextFactory *smx_context_factory_t;
XBT_PRIVATE void SIMIX_context_mod_init();
XBT_PRIVATE void SIMIX_context_mod_exit();
-XBT_PUBLIC smx_context_t SIMIX_context_new(std::function<void()> code, void_pfn_smxprocess_t cleanup_func,
- smx_actor_t simix_process);
-
#ifndef WIN32
-XBT_PUBLIC_DATA char sigsegv_stack[SIGSTKSZ];
+XBT_PUBLIC_DATA unsigned char sigsegv_stack[SIGSTKSZ];
#endif
/** @brief Executes all the processes to run (in parallel if possible). */
XBT_PUBLIC int SIMIX_process_get_maxpid();
-XBT_PRIVATE void SIMIX_post_create_environment();
-
-XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(std::string name);
+XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const std::string& name);
#endif