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 create_context return the real type.
[simgrid.git]
/
src
/
kernel
/
context
/
ContextBoost.hpp
diff --git
a/src/kernel/context/ContextBoost.hpp
b/src/kernel/context/ContextBoost.hpp
index
a1548e6
..
c0adb53
100644
(file)
--- a/
src/kernel/context/ContextBoost.hpp
+++ b/
src/kernel/context/ContextBoost.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2015-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-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. */
@@
-20,7
+20,6
@@
#include <simgrid/simix.hpp>
#include <xbt/parmap.hpp>
#include <simgrid/simix.hpp>
#include <xbt/parmap.hpp>
-#include <xbt/xbt_os_thread.h>
#include "src/internal_config.h"
#include "src/kernel/context/Context.hpp"
#include "src/internal_config.h"
#include "src/kernel/context/Context.hpp"
@@
-33,8
+32,7
@@
namespace context {
/** @brief Userspace context switching implementation based on Boost.Context */
class BoostContext : public SwappedContext {
public:
/** @brief Userspace context switching implementation based on Boost.Context */
class BoostContext : public SwappedContext {
public:
- BoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
- SwappedContextFactory* factory);
+ BoostContext(std::function<void()>&& code, actor::ActorImpl* actor, SwappedContextFactory* factory);
~BoostContext() override;
void swap_into(SwappedContext* to) override;
~BoostContext() override;
void swap_into(SwappedContext* to) override;
@@
-50,22
+48,16
@@
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_SANITIZER_ADDRESS_FIBER_SUPPORT
- const void* asan_stack_ = nullptr;
- size_t asan_stack_size_ = 0;
- BoostContext* asan_ctx_ = nullptr;
- bool asan_stop_ = false;
-#endif
static void wrapper(arg_type arg);
};
class BoostContextFactory : public SwappedContextFactory {
public:
static void wrapper(arg_type arg);
};
class BoostContextFactory : public SwappedContextFactory {
public:
- BoostContextFactory() : SwappedContextFactory("BoostContextFactory") {}
-
- Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override;
+ BoostContext* create_context(std::function<void()>&& code, actor::ActorImpl* actor) override;
};
};
-}}} // namespace
+} // namespace context
+} // namespace kernel
+} // namespace simgrid
#endif
#endif