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 sthread_inside_simgrid static into libsthread in the (vain) hope that it'll...
[simgrid.git]
/
src
/
kernel
/
context
/
Context.cpp
diff --git
a/src/kernel/context/Context.cpp
b/src/kernel/context/Context.cpp
index
f25b980
..
6827ff9
100644
(file)
--- a/
src/kernel/context/Context.cpp
+++ b/
src/kernel/context/Context.cpp
@@
-9,7
+9,7
@@
#include "simgrid/s4u/Host.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/context/Context.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/context/Context.hpp"
-#include "src/sthread/sthread.h"
// sthread_inside_simgrid
+#include "src/sthread/sthread.h"
#include "src/surf/surf_interface.hpp"
#include <vector>
#include "src/surf/surf_interface.hpp"
#include <vector>
@@
-140,7
+140,7
@@
Context::~Context()
void Context::stop()
{
this->actor_->cleanup_from_self();
void Context::stop()
{
this->actor_->cleanup_from_self();
- sthread_
inside_simgrid = 1
;
+ sthread_
disable()
;
throw ForcefulKillException(); // clean RAII variables with the dedicated exception
}
AttachContext::~AttachContext() = default;
throw ForcefulKillException(); // clean RAII variables with the dedicated exception
}
AttachContext::~AttachContext() = default;