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
make xbt_os_thread_self() useless, and kill it
[simgrid.git]
/
src
/
kernel
/
context
/
ContextBoost.hpp
diff --git
a/src/kernel/context/ContextBoost.hpp
b/src/kernel/context/ContextBoost.hpp
index
bddbb1b
..
fb60021
100644
(file)
--- a/
src/kernel/context/ContextBoost.hpp
+++ b/
src/kernel/context/ContextBoost.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2015-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-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. */
@@
-6,8
+6,14
@@
#ifndef SIMGRID_SIMIX_BOOST_CONTEXT_HPP
#define SIMGRID_SIMIX_BOOST_CONTEXT_HPP
#ifndef SIMGRID_SIMIX_BOOST_CONTEXT_HPP
#define SIMGRID_SIMIX_BOOST_CONTEXT_HPP
-#include <boost/context/all.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106100
+#include <boost/context/fcontext.hpp>
+#else
+#include <boost/context/detail/fcontext.hpp>
+#endif
+#include <atomic>
#include <cstdint>
#include <functional>
#include <vector>
#include <cstdint>
#include <functional>
#include <vector>
@@
-18,7
+24,6
@@
#include "Context.hpp"
#include "src/internal_config.h"
#include "Context.hpp"
#include "src/internal_config.h"
-#include "src/simix/smx_private.hpp"
namespace simgrid {
namespace kernel {
namespace simgrid {
namespace kernel {
@@
-33,8
+38,8
@@
public:
virtual void resume() = 0;
static void swap(BoostContext* from, BoostContext* to);
virtual void resume() = 0;
static void swap(BoostContext* from, BoostContext* to);
- static BoostContext* get
M
aestro() { return maestro_context_; }
- static void set
M
aestro(BoostContext* maestro) { maestro_context_ = maestro; }
+ static BoostContext* get
_m
aestro() { return maestro_context_; }
+ static void set
_m
aestro(BoostContext* maestro) { maestro_context_ = maestro; }
private:
static BoostContext* maestro_context_;
private:
static BoostContext* maestro_context_;
@@
-50,9
+55,10
@@
private:
boost::context::detail::fcontext_t fc_;
typedef boost::context::detail::transfer_t arg_type;
#endif
boost::context::detail::fcontext_t fc_;
typedef boost::context::detail::transfer_t arg_type;
#endif
-#if HAVE_SANITIZE_ADDRESS_FIBER_SUPPORT
+#if HAVE_SANITIZE
R
_ADDRESS_FIBER_SUPPORT
const void* asan_stack_ = nullptr;
size_t asan_stack_size_ = 0;
const void* asan_stack_ = nullptr;
size_t asan_stack_size_ = 0;
+ BoostContext* asan_ctx_ = nullptr;
bool asan_stop_ = false;
#endif
bool asan_stop_ = false;
#endif
@@
-74,7
+80,6
@@
private:
static unsigned long process_index_;
};
static unsigned long process_index_;
};
-#if HAVE_THREAD_CONTEXTS
class ParallelBoostContext : public BoostContext {
public:
ParallelBoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
class ParallelBoostContext : public BoostContext {
public:
ParallelBoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
@@
-91,22
+96,20
@@
public:
private:
static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
static std::vector<ParallelBoostContext*> workers_context_;
private:
static simgrid::xbt::Parmap<smx_actor_t>* parmap_;
static std::vector<ParallelBoostContext*> workers_context_;
- static
uintptr_t
threads_working_;
- static
xbt_os_thread_key_t worker_id_key
_;
+ static
std::atomic<uintptr_t>
threads_working_;
+ static
thread_local uintptr_t worker_id
_;
};
};
-#endif
class BoostContextFactory : public ContextFactory {
public:
BoostContextFactory();
~BoostContextFactory() override;
class BoostContextFactory : public ContextFactory {
public:
BoostContextFactory();
~BoostContextFactory() override;
- Context* create_context(std::function<void()> code, void_pfn_smxprocess_t, smx_actor_t process) override;
+ Context* create_context(std::function<void()> code, void_pfn_smxprocess_t
cleanup
, smx_actor_t process) override;
void run_all() override;
private:
bool parallel_;
};
void run_all() override;
private:
bool parallel_;
};
-
}}} // namespace
#endif
}}} // namespace
#endif