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
unify how threaded and parallelisable context factories find context_self
[simgrid.git]
/
src
/
kernel
/
context
/
Context.hpp
diff --git
a/src/kernel/context/Context.hpp
b/src/kernel/context/Context.hpp
index
50f140c
..
0f4a2b0
100644
(file)
--- a/
src/kernel/context/Context.hpp
+++ b/
src/kernel/context/Context.hpp
@@
-6,11
+6,15
@@
#ifndef SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
#define SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
#ifndef SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
#define SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
+#include "simgrid/forward.h"
#include "src/internal_config.h"
#include "src/internal_config.h"
-#include "src/
simix/smx_network_private
.hpp"
+#include "src/
kernel/activity/ActivityImpl
.hpp"
#include <csignal>
#include <csignal>
+/* 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 {
@@
-24,35
+28,33
@@
public:
virtual ~ContextFactory();
virtual Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) = 0;
virtual ~ContextFactory();
virtual Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) = 0;
- // Optional methods for attaching main() as a context:
-
- /** Creates a context from the current context of execution
- *
- * This will not work on all implementation of `ContextFactory`.
- */
+ /** Turn the current thread into a simulation context */
virtual Context* attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
virtual Context* attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
+ /** 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 void run_all() = 0;
virtual Context* create_maestro(std::function<void()> code, smx_actor_t process);
virtual void run_all() = 0;
- virtual Context* self();
+ /** @brief Returns the current context of this thread. */
+ Context* self();
std::string const& name() const { return name_; }
std::string const& name() const { return name_; }
-private:
- void declare_context(void* T, std::size_t size);
protected:
template <class T, class... Args> T* new_context(Args&&... args)
{
T* context = new T(std::forward<Args>(args)...);
protected:
template <class T, class... Args> T* new_context(Args&&... args)
{
T* context = new T(std::forward<Args>(args)...);
-
this->declare_context(context,
sizeof(T));
+
context->declare_context(
sizeof(T));
return context;
}
};
class XBT_PUBLIC Context {
return context;
}
};
class XBT_PUBLIC Context {
+ friend ContextFactory;
+
private:
std::function<void()> code_;
void_pfn_smxprocess_t cleanup_func_ = nullptr;
smx_actor_t actor_ = nullptr;
private:
std::function<void()> code_;
void_pfn_smxprocess_t cleanup_func_ = nullptr;
smx_actor_t actor_ = nullptr;
+ void declare_context(std::size_t size);
public:
class StopRequest {
public:
class StopRequest {
@@
-145,7
+147,6
@@
XBT_PRIVATE void *SIMIX_context_stack_new();
XBT_PRIVATE void SIMIX_context_stack_delete(void *stack);
XBT_PUBLIC void SIMIX_context_set_current(smx_context_t context);
XBT_PRIVATE void SIMIX_context_stack_delete(void *stack);
XBT_PUBLIC void SIMIX_context_set_current(smx_context_t context);
-XBT_PRIVATE smx_context_t SIMIX_context_get_current();
XBT_PUBLIC int SIMIX_process_get_maxpid();
XBT_PUBLIC int SIMIX_process_get_maxpid();