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
Cosmetic rename.
[simgrid.git]
/
src
/
kernel
/
context
/
ContextRaw.hpp
diff --git
a/src/kernel/context/ContextRaw.hpp
b/src/kernel/context/ContextRaw.hpp
index
68c7797
..
fb17bc6
100644
(file)
--- a/
src/kernel/context/ContextRaw.hpp
+++ b/
src/kernel/context/ContextRaw.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. */
@@
-11,14
+11,9
@@
#include <functional>
#include <vector>
#include <functional>
#include <vector>
-#include <simgrid/simix.hpp>
#include <xbt/parmap.hpp>
#include <xbt/xbt_os_thread.h>
#include <xbt/parmap.hpp>
#include <xbt/xbt_os_thread.h>
-#include "Context.hpp"
-#include "src/internal_config.h"
-#include "src/simix/smx_private.hpp"
-
namespace simgrid {
namespace kernel {
namespace context {
namespace simgrid {
namespace kernel {
namespace context {
@@
-45,6
+40,13
@@
private:
/** pointer to top the stack stack */
void* stack_top_ = nullptr;
/** pointer to top the stack stack */
void* stack_top_ = nullptr;
+#if HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT
+ const void* asan_stack_ = nullptr;
+ size_t asan_stack_size_ = 0;
+ RawContext* asan_ctx_ = nullptr;
+ bool asan_stop_ = false;
+#endif
+
static void wrapper(void* arg);
};
static void wrapper(void* arg);
};
@@
-81,7
+83,7
@@
private:
static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
static std::vector<ParallelRawContext*> workers_context_;
static std::atomic<uintptr_t> threads_working_;
static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
static std::vector<ParallelRawContext*> workers_context_;
static std::atomic<uintptr_t> threads_working_;
- static
xbt_os_thread_key_t worker_id_key
_;
+ static
uintptr_t thread_local worker_id
_;
};
#endif
};
#endif