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
[sonar] Move all #include directives before any code for C++ too.
[simgrid.git]
/
src
/
kernel
/
context
/
ContextSwapped.hpp
diff --git
a/src/kernel/context/ContextSwapped.hpp
b/src/kernel/context/ContextSwapped.hpp
index c132b63f81acbef3af0f82e8b652f691b2bc038a..a8973d159a0462fb9fd1e2a23c0ea1f3067ffb15 100644
(file)
--- a/
src/kernel/context/ContextSwapped.hpp
+++ b/
src/kernel/context/ContextSwapped.hpp
@@
-9,7
+9,6
@@
#include "src/kernel/context/Context.hpp"
#include <memory>
#include "src/kernel/context/Context.hpp"
#include <memory>
-#include <vector>
namespace simgrid {
namespace kernel {
namespace simgrid {
namespace kernel {
@@
-27,12
+26,12
@@
public:
private:
bool parallel_;
private:
bool parallel_;
- unsigned long process_index_ = 0; // Next actor to execute during sequential run_all()
+ /* For the sequential execution */
+ unsigned long process_index_ = 0; // next actor to execute
+ SwappedContext* maestro_context_ = nullptr; // save maestro's context
/* For the parallel execution */
std::unique_ptr<simgrid::xbt::Parmap<smx_actor_t>> parmap_;
/* For the parallel execution */
std::unique_ptr<simgrid::xbt::Parmap<smx_actor_t>> parmap_;
- std::vector<SwappedContext*> workers_context_; /* space to save the worker's context in each thread */
- std::atomic<uintptr_t> threads_working_{0}; /* number of threads that have started their work */
};
class SwappedContext : public Context {
};
class SwappedContext : public Context {
@@
-50,7
+49,7
@@
public:
unsigned char* get_stack();
unsigned char* get_stack();
- static thread_local
uintptr_t worker_id
_;
+ static thread_local
SwappedContext* worker_context
_;
#if HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT
const void* asan_stack_ = nullptr;
#if HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT
const void* asan_stack_ = nullptr;