-/* Copyright (c) 2007-2017. 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. */
#define SIMIX_PRIVATE_HPP
#include "simgrid/s4u/Actor.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "src/kernel/context/Context.hpp"
-#include <csignal>
-#include <map>
+#include <boost/intrusive/list.hpp>
+#include <mutex>
+#include <unordered_map>
#include <vector>
/********************************** Simix Global ******************************/
namespace simix {
class Global {
- friend bool simgrid::s4u::this_actor::isMaestro();
+ friend XBT_PUBLIC bool simgrid::s4u::this_actor::is_maestro();
public:
+ /**
+ * Garbage collection
+ *
+ * Should be called some time to time to free the memory allocated for actors that have finished (or killed).
+ */
+ void empty_trash();
+ void run_all_actors();
+
smx_context_factory_t context_factory = nullptr;
- std::vector<smx_actor_t> process_to_run;
- std::vector<smx_actor_t> process_that_ran;
+ std::vector<smx_actor_t> actors_to_run;
+ std::vector<smx_actor_t> actors_that_ran;
std::map<aid_t, smx_actor_t> process_list;
+ boost::intrusive::list<kernel::actor::ActorImpl,
+ boost::intrusive::member_hook<kernel::actor::ActorImpl, boost::intrusive::list_member_hook<>,
+ &kernel::actor::ActorImpl::smx_destroy_list_hook>>
+ actors_to_destroy;
#if SIMGRID_HAVE_MC
- /* MCer cannot read the std::map above in the remote process, so we copy the info it needs in a dynar.
+ /* MCer cannot read members process_list and actors_to_destroy above in the remote process, so we copy the info it
+ * needs in a dynar.
* FIXME: This is supposed to be a temporary hack.
* A better solution would be to change the split between MCer and MCed, where the responsibility
* to compute the list of the enabled transitions goes to the MCed.
* That way, the MCer would not need to have the list of actors on its side.
* These info could be published by the MCed to the MCer in a way inspired of vd.so
*/
- xbt_dynar_t actors_vector = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
+ xbt_dynar_t actors_vector = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
+ xbt_dynar_t dead_actors_vector = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
#endif
- xbt_swag_t process_to_destroy = nullptr;
smx_actor_t maestro_process = nullptr;
// Maps function names to actor code:
// 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<simgrid::xbt::Task<void()>> tasks;
std::vector<simgrid::xbt::Task<void()>> tasksTemp;
- std::vector<simgrid::simix::ActorImpl*> daemons;
+ std::vector<simgrid::kernel::actor::ActorImpl*> daemons;
};
}
}
-extern "C" {
+XBT_PUBLIC_DATA std::unique_ptr<simgrid::simix::Global> simix_global;
-XBT_PUBLIC_DATA(std::unique_ptr<simgrid::simix::Global>) simix_global;
-
-XBT_PUBLIC(void) SIMIX_clean();
+XBT_PUBLIC void SIMIX_clean();
/******************************** Exceptions *********************************/
-/** @brief Ask to the provided simix process to raise the provided exception */
+/** @brief Ask to the provided ActorImpl to raise the provided exception */
#define SMX_EXCEPTION(issuer, cat, val, msg) \
if (1) { \
- smx_actor_t _smx_throw_issuer = (issuer); /* evaluate only once */ \
+ simgrid::kernel::actor::ActorImpl* _smx_throw_issuer = (issuer); /* evaluate only once */ \
xbt_ex e(XBT_THROW_POINT, msg); \
- e.category = cat; \
- e.value = val; \
- _smx_throw_issuer->exception = std::make_exception_ptr(e); \
+ e.category = cat; \
+ e.value = val; \
+ _smx_throw_issuer->exception_ = std::make_exception_ptr(e); \
} else \
- ((void)0)
-}
+ ((void)0)
#endif