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
Use kernelImmediate for simcalls execution_{,parallel_}start.
[simgrid.git]
/
src
/
simix
/
smx_private.hpp
diff --git
a/src/simix/smx_private.hpp
b/src/simix/smx_private.hpp
index
e6cc998
..
bcbb2f6
100644
(file)
--- a/
src/simix/smx_private.hpp
+++ b/
src/simix/smx_private.hpp
@@
-8,10
+8,9
@@
#include "simgrid/s4u/Actor.hpp"
#include "src/kernel/context/Context.hpp"
#include "simgrid/s4u/Actor.hpp"
#include "src/kernel/context/Context.hpp"
-#include <
csignal
>
+#include <
xbt/xbt_os_thread.h
>
-#include <boost/intrusive/list.hpp>
-#include <map>
+#include <unordered_map>
#include <vector>
/********************************** Simix Global ******************************/
#include <vector>
/********************************** Simix Global ******************************/
@@
-20,7
+19,7
@@
namespace simgrid {
namespace simix {
class Global {
namespace simix {
class Global {
- friend XBT_PUBLIC bool simgrid::s4u::this_actor::is
M
aestro();
+ friend XBT_PUBLIC bool simgrid::s4u::this_actor::is
_m
aestro();
public:
smx_context_factory_t context_factory = nullptr;
public:
smx_context_factory_t context_factory = nullptr;
@@
-65,8
+64,6
@@
public:
}
}
}
}
-extern "C" {
-
XBT_PUBLIC_DATA std::unique_ptr<simgrid::simix::Global> simix_global;
XBT_PUBLIC void SIMIX_clean();
XBT_PUBLIC_DATA std::unique_ptr<simgrid::simix::Global> simix_global;
XBT_PUBLIC void SIMIX_clean();
@@
-82,6
+79,5
@@
XBT_PUBLIC void SIMIX_clean();
_smx_throw_issuer->exception = std::make_exception_ptr(e); \
} else \
((void)0)
_smx_throw_issuer->exception = std::make_exception_ptr(e); \
} else \
((void)0)
-}
#endif
#endif