A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
please sonar
[simgrid.git]
/
src
/
kernel
/
context
/
Context.hpp
diff --git
a/src/kernel/context/Context.hpp
b/src/kernel/context/Context.hpp
index
c851241
..
e1e7bf1
100644
(file)
--- a/
src/kernel/context/Context.hpp
+++ b/
src/kernel/context/Context.hpp
@@
-12,9
+12,6
@@
#include <csignal>
#include <functional>
#include <csignal>
#include <functional>
-/* Process creation/destruction callbacks */
-typedef void (*void_pfn_smxprocess_t)(smx_actor_t);
-
namespace simgrid {
namespace kernel {
namespace context {
namespace simgrid {
namespace kernel {
namespace context {
@@
-23,12
+20,12
@@
class XBT_PUBLIC ContextFactory {
public:
explicit ContextFactory() {}
virtual ~ContextFactory();
public:
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_context(std::function<void()> code,
smx_actor_t actor
) = 0;
/** Turn the current thread into a simulation context */
/** Turn the current thread into a simulation context */
- virtual Context* attach(
void_pfn_smxprocess_t cleanup_func, smx_actor_t process
);
+ virtual Context* attach(
smx_actor_t actor
);
/** Turn the current thread into maestro (the old maestro becomes a regular 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, smx_actor_t
actor
);
virtual void run_all() = 0;
virtual void run_all() = 0;
@@
-44,16
+41,14
@@
protected:
class XBT_PUBLIC Context {
friend ContextFactory;
class XBT_PUBLIC Context {
friend ContextFactory;
-private:
std::function<void()> code_;
std::function<void()> code_;
- void_pfn_smxprocess_t cleanup_func_ = nullptr;
smx_actor_t actor_ = nullptr;
void declare_context(std::size_t size);
public:
bool iwannadie = false;
smx_actor_t 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, smx_actor_t actor);
Context(const Context&) = delete;
Context& operator=(const Context&) = delete;
virtual ~Context();
Context(const Context&) = delete;
Context& operator=(const Context&) = delete;
virtual ~Context();
@@
-61,7
+56,6
@@
public:
void operator()() { code_(); }
bool has_code() const { return static_cast<bool>(code_); }
smx_actor_t get_actor() { return this->actor_; }
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; }
// Scheduling methods
virtual void stop();
// Scheduling methods
virtual void stop();
@@
-76,10
+70,7
@@
public:
class XBT_PUBLIC AttachContext : public Context {
public:
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, smx_actor_t actor) : Context(std::move(code), actor) {}
~AttachContext() override;
~AttachContext() override;
@@
-127,9
+118,6
@@
typedef simgrid::kernel::context::ContextFactory *smx_context_factory_t;
XBT_PRIVATE void SIMIX_context_mod_init();
XBT_PRIVATE void SIMIX_context_mod_exit();
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];
#endif
#ifndef WIN32
XBT_PUBLIC_DATA char sigsegv_stack[SIGSTKSZ];
#endif
@@
-139,8
+127,6
@@
XBT_PRIVATE void SIMIX_context_runall();
XBT_PUBLIC int SIMIX_process_get_maxpid();
XBT_PUBLIC int SIMIX_process_get_maxpid();
-XBT_PRIVATE void SIMIX_post_create_environment();
-
XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const std::string& name);
#endif
XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const std::string& name);
#endif