XBT_LOG_NEW_DEFAULT_CATEGORY(ker_engine, "Logging specific to Engine (kernel)");
-namespace simgrid {
-namespace kernel {
+namespace simgrid::kernel {
double EngineImpl::now_ = 0.0;
EngineImpl* EngineImpl::instance_ = nullptr; /* That singleton is awful too. */
(std::string("Possible values: ") + contexts_list()).c_str(),
context_factories.begin()->first);
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel
XBT_ATTRIB_NORETURN static void inthandler(int)
{
} else if (siginfo->si_signo == SIGSEGV) {
fprintf(stderr, "Segmentation fault.\n");
#if HAVE_SMPI
- if (smpi_enabled() && smpi_cfg_privatization() == SmpiPrivStrategies::NONE) {
+ if (SMPI_is_inited() && smpi_cfg_privatization() == SmpiPrivStrategies::NONE) {
#if HAVE_PRIVATIZATION
fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatization:yes.\n");
#else
#endif /* _WIN32 */
-namespace simgrid {
-namespace kernel {
+namespace simgrid::kernel {
EngineImpl::~EngineImpl()
{
XBT_DEBUG("EngineImpl::shutdown() called. Simulation's over.");
#if HAVE_SMPI
if (not instance_->actor_list_.empty()) {
- if (smpi_process()->initialized()) {
+ if (smpi_process() && smpi_process()->initialized()) {
xbt_die("Process exited without calling MPI_Finalize - Killing simulation");
} else {
XBT_WARN("Process called exit when leaving - Skipping cleanups");
xbt_assert(models_prio_.find(model_name) == models_prio_.end(),
"Model %s already exists, use model.set_name() to change its name", model_name.c_str());
- for (const auto dep : dependencies) {
+ for (const auto* dep : dependencies) {
xbt_assert(models_prio_.find(dep->get_name()) != models_prio_.end(),
"Model %s doesn't exists. Impossible to use it as dependency.", dep->get_name().c_str());
}
actor::ActorImpl* EngineImpl::get_actor_by_pid(aid_t pid)
{
auto item = actor_list_.find(pid);
- if (item != actor_list_.end())
- return item->second;
-
- return nullptr; // Not found
+ return item == actor_list_.end() ? nullptr : item->second;
}
void EngineImpl::remove_daemon(actor::ActorImpl* actor)
XBT_DEBUG("Updating models (min = %g, NOW = %g, next_event_date = %g)", time_delta, now_, next_event_date);
while (auto* event = profile::future_evt_set.pop_leq(next_event_date, &value, &resource)) {
+ if(value<0)
+ continue;
if (resource->is_used() || (watched_hosts().find(resource->get_cname()) != watched_hosts().end())) {
time_delta = next_event_date - now_;
XBT_DEBUG("This event invalidates the next_occurring_event() computation of models. Next event set to %f",
{
return now_;
}
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel