-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2018. 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. */
#include "src/kernel/context/Context.hpp"
#include <csignal>
+#include <boost/intrusive/list.hpp>
#include <map>
#include <vector>
namespace simix {
class Global {
- friend bool simgrid::s4u::this_actor::isMaestro();
+ friend XBT_PUBLIC bool simgrid::s4u::this_actor::isMaestro();
public:
smx_context_factory_t context_factory = nullptr;
std::vector<smx_actor_t> process_to_run;
std::vector<smx_actor_t> process_that_ran;
std::map<aid_t, smx_actor_t> process_list;
- xbt_swag_t process_to_destroy = nullptr;
+ 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>>
+ process_to_destroy;
#if SIMGRID_HAVE_MC
/* MCer cannot read members process_list and process_to_destroy above in the remote process, so we copy the info it
* needs in a dynar.
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 ActorImpl to raise the provided exception */
#define SMX_EXCEPTION(issuer, cat, val, msg) \
if (1) { \
- simgrid::simix::ActorImpl* _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); \
} else \
- ((void)0)
+ ((void)0)
}
#endif