namespace simgrid {
namespace simix {
-simgrid::config::Flag<double> cfg_verbose_exit{
- "debug/verbose-exit", {"verbose-exit"}, "Display the actor status at exit", true};
-}
+config::Flag<double> cfg_verbose_exit{"debug/verbose-exit", {"verbose-exit"}, "Display the actor status at exit", true};
+} // namespace simix
} // namespace simgrid
+
XBT_ATTRIB_NORETURN static void inthandler(int)
{
if (simgrid::simix::cfg_verbose_exit) {
namespace simgrid {
namespace simix {
-Timer* Timer::set(double date, simgrid::xbt::Task<void()>&& callback)
+Timer* Timer::set(double date, xbt::Task<void()>&& callback)
{
Timer* timer = new Timer(date, std::move(callback));
timer->handle_ = simix_timers.emplace(std::make_pair(date, timer));
/** @brief cancels a timer that was added earlier */
void Timer::remove()
{
- simgrid::simix::simix_timers.erase(handle_);
+ simix_timers.erase(handle_);
delete this;
}
void Global::empty_trash()
{
while (not actors_to_destroy.empty()) {
- smx_actor_t actor = &actors_to_destroy.front();
+ kernel::actor::ActorImpl* actor = &actors_to_destroy.front();
actors_to_destroy.pop_front();
XBT_DEBUG("Getting rid of %s (refcount: %d)", actor->get_cname(), actor->get_refcount());
intrusive_ptr_release(actor);
actors_to_run.clear();
}
-simgrid::config::Flag<double> cfg_breakpoint{
+config::Flag<double> cfg_breakpoint{
"debug/breakpoint", {"simix/breakpoint"}, "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0};
-}
-}
+} // namespace simix
+} // namespace simgrid
static simgrid::simix::ActorCode maestro_code;
void SIMIX_set_maestro(void (*code)(void*), void* data)
* That would thus be a pure waste of time.
*/
- for (smx_actor_t const& process : simix_global->actors_that_ran) {
- if (process->simcall.call_ != SIMCALL_NONE) {
- process->simcall_handle(0);
+ for (auto const& actor : simix_global->actors_that_ran) {
+ if (actor->simcall.call_ != SIMCALL_NONE) {
+ actor->simcall_handle(0);
}
}
/* List the process and their state */
XBT_INFO("Legend of the following listing: \"Process <pid> (<name>@<host>): <status>\"");
for (auto const& kv : simix_global->process_list) {
- smx_actor_t actor = kv.second;
+ simgrid::kernel::actor::ActorImpl* actor = kv.second;
if (actor->waiting_synchro) {
void run_all_actors();
smx_context_factory_t context_factory = nullptr;
- 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;
+ std::vector<kernel::actor::ActorImpl*> actors_to_run;
+ std::vector<kernel::actor::ActorImpl*> actors_that_ran;
+ std::map<aid_t, kernel::actor::ActorImpl*> 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>>
* 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 dead_actors_vector = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
+ xbt_dynar_t actors_vector = xbt_dynar_new(sizeof(kernel::actor::ActorImpl*), nullptr);
+ xbt_dynar_t dead_actors_vector = xbt_dynar_new(sizeof(kernel::actor::ActorImpl*), nullptr);
#endif
- smx_actor_t maestro_process = nullptr;
+ kernel::actor::ActorImpl* maestro_process = nullptr;
// Maps function names to actor code:
- std::unordered_map<std::string, simgrid::simix::ActorCodeFactory> registered_functions;
+ std::unordered_map<std::string, simix::ActorCodeFactory> registered_functions;
// This might be used when no corresponding function name is registered:
- simgrid::simix::ActorCodeFactory default_function;
+ simix::ActorCodeFactory default_function;
std::mutex mutex;
- std::vector<simgrid::xbt::Task<void()>> tasks;
- std::vector<simgrid::xbt::Task<void()>> tasksTemp;
+ std::vector<xbt::Task<void()>> tasks;
+ std::vector<xbt::Task<void()>> tasksTemp;
- std::vector<simgrid::kernel::actor::ActorImpl*> daemons;
+ std::vector<kernel::actor::ActorImpl*> daemons;
};
}
}