X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/149757f655ffaf7bc403d634de3ef04b72b7a067..2d37e348a09783cda723c7019640ee69de168324:/src/simix/smx_private.hpp diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp index bcbb2f6a8d..f22840caaf 100644 --- a/src/simix/smx_private.hpp +++ b/src/simix/smx_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. 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. */ @@ -8,8 +8,10 @@ #include "simgrid/s4u/Actor.hpp" #include "src/kernel/context/Context.hpp" -#include +#include "src/simix/ActorImpl.hpp" +#include +#include #include #include @@ -50,11 +52,7 @@ public: // This might be used when no corresponding function name is registered: simgrid::simix::ActorCodeFactory default_function; - smx_creation_func_t create_process_function = nullptr; - 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;