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
thread_local fields must be static, no need to move to the factory
[simgrid.git]
/
src
/
kernel
/
context
/
ContextSwapped.hpp
diff --git
a/src/kernel/context/ContextSwapped.hpp
b/src/kernel/context/ContextSwapped.hpp
index
a4fc733
..
ad618f9
100644
(file)
--- a/
src/kernel/context/ContextSwapped.hpp
+++ b/
src/kernel/context/ContextSwapped.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-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. */
@@
-35,7
+35,7
@@
private:
class SwappedContext : public Context {
public:
class SwappedContext : public Context {
public:
- SwappedContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t
process
,
+ SwappedContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t
get_actor
,
SwappedContextFactory* factory);
virtual ~SwappedContext();
SwappedContextFactory* factory);
virtual ~SwappedContext();
@@
-45,16
+45,13
@@
public:
virtual void swap_into(SwappedContext* to) = 0; // Defined in Raw, Boost and UContext subclasses
virtual void swap_into(SwappedContext* to) = 0; // Defined in Raw, Boost and UContext subclasses
- void
set_maestro(SwappedContext* ctx
);
+ void
* get_stack(
);
- // FIXME: Killme
static thread_local uintptr_t worker_id_;
static thread_local uintptr_t worker_id_;
-protected:
- void* stack_ = nullptr; /* the thread stack */
-
private:
private:
- SwappedContextFactory* factory_; // for sequential and parallel run_all()
+ void* stack_ = nullptr; /* the thread stack */
+ SwappedContextFactory* const factory_; // for sequential and parallel run_all()
};
} // namespace context
};
} // namespace context