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
Move ASan related instructions around context swapping into SwappedContext.
[simgrid.git]
/
src
/
kernel
/
context
/
ContextRaw.hpp
diff --git
a/src/kernel/context/ContextRaw.hpp
b/src/kernel/context/ContextRaw.hpp
index
40b74a4
..
f9b30e0
100644
(file)
--- a/
src/kernel/context/ContextRaw.hpp
+++ b/
src/kernel/context/ContextRaw.hpp
@@
-1,10
+1,10
@@
-/* Copyright (c) 2009-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-20
20
. 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. */
-#ifndef SIMGRID_
SIMIX
_RAW_CONTEXT_HPP
-#define SIMGRID_
SIMIX
_RAW_CONTEXT_HPP
+#ifndef SIMGRID_
KERNEL_CONTEXT
_RAW_CONTEXT_HPP
+#define SIMGRID_
KERNEL_CONTEXT
_RAW_CONTEXT_HPP
#include <atomic>
#include <cstdint>
#include <atomic>
#include <cstdint>
@@
-26,21
+26,21
@@
namespace context {
*/
class RawContext : public SwappedContext {
public:
*/
class RawContext : public SwappedContext {
public:
- RawContext(std::function<void()> code, smx_actor_t actor, SwappedContextFactory* factory);
-
- void swap_into(SwappedContext* to) override;
+ RawContext(std::function<void()>&& code, actor::ActorImpl* actor, SwappedContextFactory* factory);
private:
/** pointer to top the stack stack */
void* stack_top_ = nullptr;
private:
/** pointer to top the stack stack */
void* stack_top_ = nullptr;
-
static void wrapper(void* arg)
;
+
void swap_into_for_real(SwappedContext* to) override
;
};
class RawContextFactory : public SwappedContextFactory {
public:
};
class RawContextFactory : public SwappedContextFactory {
public:
-
Context* create_context(std::function<void()> code, smx_actor_t
actor) override;
+
RawContext* create_context(std::function<void()>&& code, actor::ActorImpl*
actor) override;
};
};
-}}} // namespace
+} // namespace context
+} // namespace kernel
+} // namespace simgrid
#endif
#endif