-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2019. 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. */
#define SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
#include "simgrid/forward.h"
-#include "src/internal_config.h"
#include "src/kernel/activity/ActivityImpl.hpp"
#include <csignal>
namespace context {
class XBT_PUBLIC ContextFactory {
-private:
- std::string name_;
-
public:
- explicit ContextFactory(std::string name) : name_(std::move(name)) {}
+ explicit ContextFactory() {}
virtual ~ContextFactory();
virtual Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) = 0;
virtual Context* create_maestro(std::function<void()> code, smx_actor_t process);
virtual void run_all() = 0;
- std::string const& name() const { return name_; }
protected:
template <class T, class... Args> T* new_context(Args&&... args)
public:
bool iwannadie = false;
- Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
+ Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t 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 process() { return this->actor_; }
+ smx_actor_t get_actor() { return this->actor_; }
void set_cleanup(void_pfn_smxprocess_t cleanup) { cleanup_func_ = cleanup; }
// Scheduling methods
public:
StopRequest() = default;
explicit StopRequest(std::string msg) : msg_(std::string("Actor killed (") + msg + std::string(").")) {}
- virtual const char* what() const noexcept { return msg_.c_str(); }
+ const char* what() const noexcept { return msg_.c_str(); }
private:
std::string msg_ = std::string("Actor killed.");
XBT_PUBLIC_DATA char sigsegv_stack[SIGSTKSZ];
#endif
-/* We are using the bottom of the stack to save some information, like the
- * valgrind_stack_id. Define smx_context_usable_stack_size to give the remaining
- * size for the stack. Round its value to a multiple of 16 (asan wants the stacks to be aligned this way). */
-#if HAVE_VALGRIND_H
-#define smx_context_usable_stack_size \
- ((smx_context_stack_size - sizeof(unsigned int)) & ~0xf) /* for valgrind_stack_id */
-#else
-#define smx_context_usable_stack_size (smx_context_stack_size & ~0xf)
-#endif
-
/** @brief Executes all the processes to run (in parallel if possible). */
XBT_PRIVATE void SIMIX_context_runall();