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' into v3.20-expose-simgrid-jni
[simgrid.git]
/
src
/
kernel
/
context
/
ContextUnix.hpp
diff --git
a/src/kernel/context/ContextUnix.hpp
b/src/kernel/context/ContextUnix.hpp
index
471b11f
..
88976a8
100644
(file)
--- a/
src/kernel/context/ContextUnix.hpp
+++ b/
src/kernel/context/ContextUnix.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-201
8
. 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. */
@@
-32,7
+32,7
@@
public:
void stop() override;
virtual void resume() = 0;
void stop() override;
virtual void resume() = 0;
- static void swap(UContext* from, UContext* to)
{ swapcontext(&from->uc_, &to->uc_); }
+ static void swap(UContext* from, UContext* to)
;
static UContext* getMaestro() { return maestro_context_; }
static void setMaestro(UContext* maestro) { maestro_context_ = maestro; }
static UContext* getMaestro() { return maestro_context_; }
static void setMaestro(UContext* maestro) { maestro_context_ = maestro; }
@@
-41,7
+41,14
@@
private:
void* stack_ = nullptr; /* the thread stack */
ucontext_t uc_; /* the ucontext that executes the code */
void* stack_ = nullptr; /* the thread stack */
ucontext_t uc_; /* the ucontext that executes the code */
- static void wrapper(int, int);
+#if HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT
+ const void* asan_stack_ = nullptr;
+ size_t asan_stack_size_ = 0;
+ UContext* asan_ctx_ = nullptr;
+ bool asan_stop_ = false;
+#endif
+
+ static void smx_ctx_sysv_wrapper(int, int);
static void make_ctx(ucontext_t* ucp, void (*func)(int, int), UContext* arg);
};
static void make_ctx(ucontext_t* ucp, void (*func)(int, int), UContext* arg);
};
@@
-78,7
+85,7
@@
private:
static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
static std::vector<ParallelUContext*> workers_context_;
static std::atomic<uintptr_t> threads_working_;
static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
static std::vector<ParallelUContext*> workers_context_;
static std::atomic<uintptr_t> threads_working_;
- static
xbt_os_thread_key_t worker_id_key
_;
+ static
thread_local uintptr_t worker_id
_;
};
#endif
};
#endif