-/* Copyright (c) 2016-2022. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-2023. 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 "xbt/xbt_modinter.h" /* whether initialization was already done */
#include <boost/algorithm/string/predicate.hpp>
-#ifndef _WIN32
#include <dlfcn.h>
-#endif /* _WIN32 */
#if SIMGRID_HAVE_MC
#include "src/mc/remote/AppSide.hpp"
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. */
"When non-negative, raise a SIGTRAP after given (simulated) time", -1.0};
config::Flag<bool> cfg_verbose_exit{"debug/verbose-exit", "Display the actor status at exit", true};
-constexpr std::initializer_list<std::pair<const char*, context::ContextFactoryInitializer>> context_factories = {
+constexpr std::initializer_list<std::pair<const char*, context::ContextFactory* (*)()>> context_factories = {
#if HAVE_RAW_CONTEXTS
{"raw", &context::raw_factory},
#endif
{
std::string res;
std::string sep = "";
- for (auto const& factory : context_factories) {
- res += sep + factory.first;
+ for (auto const& [factory_name, _] : context_factories) {
+ res += sep + factory_name;
sep = ", ";
}
return res;
}
static config::Flag<std::string> context_factory_name("contexts/factory",
- (std::string("Possible values: ") + contexts_list()).c_str(),
+ ("Possible values: " + contexts_list()).c_str(),
context_factories.begin()->first);
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel
XBT_ATTRIB_NORETURN static void inthandler(int)
{
exit(1);
}
-#ifndef _WIN32
static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/)
{
if ((siginfo->si_signo == SIGSEGV && siginfo->si_code == SEGV_ACCERR) || siginfo->si_signo == SIGBUS) {
} 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
}
/**
- * Install signal handler for SIGSEGV. Check that nobody has already installed
- * its own handler. For example, the Java VM does this.
+ * Install signal handler for SIGSEGV. Check that nobody has already installed its own handler.
+ * Historically, the Java VM did that but this could maybe removed now that Java is gone (TODO)
*/
static void install_segvhandler()
{
}
}
-#endif /* _WIN32 */
-
-namespace simgrid {
-namespace kernel {
+namespace simgrid::kernel {
EngineImpl::~EngineImpl()
{
- /* Since hosts_ is a std::map, the hosts are destroyed in the lexicographic order, which ensures that the output is
- * reproducible.
- */
- while (not hosts_.empty())
- hosts_.begin()->second->destroy();
-
/* Also delete the other data */
delete netzone_root_;
- for (auto const& kv : netpoints_)
- delete kv.second;
-
- while (not links_.empty())
- links_.begin()->second->destroy();
+ for (auto const& [_, netpoint] : netpoints_)
+ delete netpoint;
- for (auto const& kv : mailboxes_)
- delete kv.second;
+ for (auto const& [_, mailbox] : mailboxes_)
+ delete mailbox;
/* Kill all actors (but maestro) */
maestro_->kill_all();
delete maestro_;
delete context_factory_;
- /* Free the remaining data structures */
-#if SIMGRID_HAVE_MC
- xbt_dynar_free(&actors_vector_);
-#endif
/* clear models before freeing handle, network models can use external callback defined in the handle */
models_prio_.clear();
}
// The communication initialization is done ASAP, as we need to get some init parameters from the MC for different
// layers. But instance_ needs to be created, as we send the address of some of its fields to the MC that wants to
// read them directly.
- simgrid::mc::AppSide::initialize(actors_vector_);
+ simgrid::mc::AppSide::initialize();
#endif
if (xbt_initialized == 0) {
/* Prepare to display some more info when dying on Ctrl-C pressing */
std::signal(SIGINT, inthandler);
-
-#ifndef _WIN32
install_segvhandler();
-#endif
/* register a function to be called by SURF after the environment creation */
sg_platf_init();
}
#endif
- /* select the context factory to use to create the contexts */
- if (context::factory_initializer != nullptr) { // Give Java a chance to hijack the factory mechanism
- instance_->set_context_factory(context::factory_initializer());
- return;
- }
/* use the factory specified by --cfg=contexts/factory:value */
- for (auto const& factory : context_factories)
- if (context_factory_name == factory.first) {
- instance_->set_context_factory(factory.second());
+ for (auto const& [factory_name, factory] : context_factories)
+ if (context_factory_name == factory_name) {
+ instance_->set_context_factory(factory());
break;
}
XBT_ERROR(" (boost was disabled at compilation time on this machine -- check configure logs for details. Did you "
"install the libboost-context-dev package?)");
#endif
- XBT_ERROR(" thread: slow portability layer using pthreads as provided by gcc");
+ XBT_ERROR(" thread: slow portability layer using standard threads as provided by libstdc");
xbt_die("Please use a valid factory.");
}
}
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");
return;
sealed = true;
- /* sealing resources before run: links */
- for (auto const& kv : links_)
- kv.second->get_iface()->seal();
/* seal netzone root, recursively seal children netzones, hosts and disks */
netzone_root_->seal();
}
{
double start = xbt_os_time();
if (boost::algorithm::ends_with(platf, ".so") || boost::algorithm::ends_with(platf, ".dylib")) {
-#ifdef _WIN32
- xbt_die("loading platform through shared library isn't supported on windows");
-#else
void* handle = dlopen(platf.c_str(), RTLD_LAZY);
xbt_assert(handle, "Impossible to open platform file: %s", platf.c_str());
platf_handle_ = std::unique_ptr<void, std::function<int(void*)>>(handle, dlclose);
const char* dlsym_error = dlerror();
xbt_assert(not dlsym_error, "Error: %s", dlsym_error);
callable(*simgrid::s4u::Engine::get_instance());
-#endif /* _WIN32 */
} else {
parse_platform_file(platf);
}
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());
}
models_prio_[model_name] = std::move(model);
}
-void EngineImpl::add_split_duplex_link(const std::string& name, std::unique_ptr<resource::SplitDuplexLinkImpl> link)
-{
- split_duplex_links_[name] = std::move(link);
-}
-
/** Wake up all actors waiting for a Surf action to finish */
void EngineImpl::handle_ended_actions() const
{
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_INFO("%zu actors are still running, waiting for something.", actor_list_.size());
/* List the actors and their state */
XBT_INFO("Legend of the following listing: \"Actor <pid> (<name>@<host>): <status>\"");
- for (auto const& kv : actor_list_) {
- const actor::ActorImpl* actor = kv.second;
-
+ for (auto const& [_, actor] : actor_list_) {
if (actor->waiting_synchro_) {
const char* synchro_description = "unknown";
if (boost::dynamic_pointer_cast<kernel::activity::IoImpl>(actor->waiting_synchro_) != nullptr)
synchro_description = "I/O";
- XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %#zx (%s) in state %s to finish", actor->get_pid(),
+ XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %#zx (%s) in state %s to finish %s", actor->get_pid(),
actor->get_cname(), actor->get_host()->get_cname(), synchro_description,
(xbt_log_no_loc ? (size_t)0xDEADBEEF : (size_t)actor->waiting_synchro_.get()),
- actor->waiting_synchro_->get_cname(), actor->waiting_synchro_->get_state_str());
+ actor->waiting_synchro_->get_cname(), actor->waiting_synchro_->get_state_str(),
+ (actor->simcall_.observer_ != nullptr && not xbt_log_no_loc
+ ? actor->simcall_.observer_->to_string().c_str()
+ : ""));
} else {
XBT_INFO("Actor %ld (%s@%s) simcall %s", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname(),
- actor->simcall_.get_cname());
+ (actor->simcall_.observer_ != nullptr ? actor->simcall_.observer_->to_string().c_str()
+ : actor->simcall_.get_cname()));
}
}
}
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",
}
display_all_actor_status();
simgrid::s4u::Engine::on_deadlock();
- for (auto const& kv : actor_list_) {
- XBT_DEBUG("Kill %s", kv.second->get_cname());
- maestro_->kill(kv.second);
+ for (auto const& [_, actor] : actor_list_) {
+ XBT_DEBUG("Kill %s", actor->get_cname());
+ maestro_->kill(actor);
}
}
} while ((vetoed_activities == nullptr || vetoed_activities->empty()) &&
{
return now_;
}
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel
