X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6847a26d9973030337f6ef9f18464b1f04ce7452..196327afa332e6c85827da70da72a1aaa178739a:/src/simix/smx_private.hpp diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp index 3609c1f002..ea586f129a 100644 --- a/src/simix/smx_private.hpp +++ b/src/simix/smx_private.hpp @@ -8,7 +8,11 @@ #include "simgrid/s4u/Actor.hpp" #include "src/kernel/context/Context.hpp" +#include "src/simix/ActorImpl.hpp" +#include +#include +#include #include #include @@ -53,7 +57,7 @@ public: void_pfn_smxprocess_t kill_process_function = nullptr; /** Callback used when killing a SMX_process */ void_pfn_smxprocess_t cleanup_process_function = nullptr; - xbt_os_mutex_t mutex = nullptr; + std::mutex mutex; std::vector> tasks; std::vector> tasksTemp; @@ -63,8 +67,6 @@ public: } } -extern "C" { - XBT_PUBLIC_DATA std::unique_ptr simix_global; XBT_PUBLIC void SIMIX_clean(); @@ -80,6 +82,5 @@ XBT_PUBLIC void SIMIX_clean(); _smx_throw_issuer->exception = std::make_exception_ptr(e); \ } else \ ((void)0) -} #endif