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
Merge branch 'master' of framagit.org:simgrid/simgrid
[simgrid.git]
/
src
/
kernel
/
context
/
ContextSwapped.hpp
diff --git
a/src/kernel/context/ContextSwapped.hpp
b/src/kernel/context/ContextSwapped.hpp
index
6e56bb1
..
aba97d5
100644
(file)
--- a/
src/kernel/context/ContextSwapped.hpp
+++ b/
src/kernel/context/ContextSwapped.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-201
9
. 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. */
/* 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. */
@@
-18,7
+18,7
@@
class SwappedContext;
class SwappedContextFactory : public ContextFactory {
friend SwappedContext; // Reads whether we are in parallel mode
public:
class SwappedContextFactory : public ContextFactory {
friend SwappedContext; // Reads whether we are in parallel mode
public:
- SwappedContextFactory(
std::string name
);
+ SwappedContextFactory();
~SwappedContextFactory() override;
void run_all() override;
~SwappedContextFactory() override;
void run_all() override;
@@
-30,12
+30,12
@@
private:
/* For the parallel execution */
simgrid::xbt::Parmap<smx_actor_t>* parmap_;
std::vector<SwappedContext*> workers_context_; /* space to save the worker's context in each thread */
/* For the parallel execution */
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_
;
/* number of threads that have started their work */
+ std::atomic<uintptr_t> threads_working_
{0};
/* number of threads that have started their work */
};
class SwappedContext : public Context {
public:
};
class SwappedContext : public Context {
public:
- SwappedContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t
process
,
+ SwappedContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t
get_actor
,
SwappedContextFactory* factory);
virtual ~SwappedContext();
SwappedContextFactory* factory);
virtual ~SwappedContext();
@@
-45,18
+45,20
@@
public:
virtual void swap_into(SwappedContext* to) = 0; // Defined in Raw, Boost and UContext subclasses
virtual void swap_into(SwappedContext* to) = 0; // Defined in Raw, Boost and UContext subclasses
- static SwappedContext* get_maestro() { return maestro_context_; }
- static void set_maestro(SwappedContext* maestro) { maestro_context_ = maestro; }
+ void* get_stack();
- // FIXME: Killme
static thread_local uintptr_t worker_id_;
static thread_local uintptr_t worker_id_;
-protected:
- void* stack_ = nullptr; /* the thread stack */
+#if HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT
+ const void* asan_stack_ = nullptr;
+ size_t asan_stack_size_ = 0;
+ SwappedContext* asan_ctx_ = nullptr;
+ bool asan_stop_ = false;
+#endif
private:
private:
- static SwappedContext* maestro_context_;
- SwappedContextFactory* factory_; // for sequential and parallel run_all()
+ void* stack_ = nullptr; /* the thread stack */
+ SwappedContextFactory*
const
factory_; // for sequential and parallel run_all()
};
} // namespace context
};
} // namespace context