-/* Copyright (c) 2007-2018. 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. */
-#include <boost/heap/fibonacci_heap.hpp>
-#include <functional>
-#include <memory>
-
-#include "src/internal_config.h"
-#include <csignal> /* Signal handling */
-#include <cstdlib>
-
-#include <xbt/functional.hpp>
-#include <xbt/utility.hpp>
-
+#include "mc/mc.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
+#include "src/smpi/include/smpi_actor.hpp"
-#include "smx_private.hpp"
-#include "src/surf/surf_interface.hpp"
-#include "src/surf/xml/platf.hpp"
-#include "xbt/ex.h" /* ex_backtrace_display */
-
-#include "mc/mc.h"
-#include "simgrid/sg_config.h"
-#include "src/mc/mc_replay.hpp"
-#include "src/surf/StorageImpl.hpp"
-
-#include "src/smpi/include/smpi_process.hpp"
-
-#include "src/kernel/activity/CommImpl.hpp"
+#include "simgrid/sg_config.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
+#include "src/kernel/activity/IoImpl.hpp"
+#include "src/kernel/activity/MailboxImpl.hpp"
#include "src/kernel/activity/SleepImpl.hpp"
-#include "src/kernel/activity/SynchroIo.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/mc/mc_record.hpp"
+#include "src/mc/mc_replay.hpp"
+#include "src/simix/smx_host_private.hpp"
+#include "src/simix/smx_private.hpp"
+#include "src/surf/StorageImpl.hpp"
+#include "src/surf/xml/platf.hpp"
#if SIMGRID_HAVE_MC
-#include "src/mc/mc_private.hpp"
#include "src/mc/remote/Client.hpp"
-#include "src/mc/remote/mc_protocol.h"
#endif
-#include "src/mc/mc_record.hpp"
-
-#if HAVE_SMPI
-#include "src/smpi/include/private.hpp"
-#endif
+#include <boost/heap/fibonacci_heap.hpp>
XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)");
void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr) = nullptr;
-int _sg_do_verbose_exit = 1;
+bool _sg_do_verbose_exit = true;
static void inthandler(int)
{
if ( _sg_do_verbose_exit ) {
} else if (siginfo->si_signo == SIGSEGV) {
fprintf(stderr, "Segmentation fault.\n");
#if HAVE_SMPI
- if (smpi_enabled() && smpi_privatize_global_variables == SMPI_PRIVATIZE_NONE) {
+ if (smpi_enabled() && smpi_privatize_global_variables == SmpiPrivStrategies::NONE) {
#if HAVE_PRIVATIZATION
fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatization:yes.\n");
#else
}
#endif /* HAVE_SMPI */
}
- raise(signum);
+ std::raise(signum);
}
char sigsegv_stack[SIGSTKSZ]; /* alternate stack for SIGSEGV handler */
namespace simgrid {
namespace simix {
-simgrid::xbt::signal<void()> onDeadlock;
-
+simgrid::config::Flag<double> breakpoint{"simix/breakpoint",
+ "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0};
}
}
-static std::function<void()> maestro_code;
+static simgrid::simix::ActorCode maestro_code;
void SIMIX_set_maestro(void (*code)(void*), void* data)
{
#ifdef _WIN32
}
/**
- * \ingroup SIMIX_API
- * \brief Initialize SIMIX internal data.
+ * @ingroup SIMIX_API
+ * @brief Initialize SIMIX internal data.
*/
void SIMIX_global_init(int *argc, char **argv)
{
simgrid::mc::Client::initialize();
#endif
- if (not simix_global) {
+ if (simix_global == nullptr) {
simix_global = std::unique_ptr<simgrid::simix::Global>(new simgrid::simix::Global());
simix_global->maestro_process = nullptr;
- simix_global->create_process_function = &SIMIX_process_create;
- simix_global->kill_process_function = &kill_process;
- simix_global->cleanup_process_function = &SIMIX_process_cleanup;
- simix_global->mutex = xbt_os_mutex_init();
surf_init(argc, argv); /* Initialize SURF structures */
SIMIX_context_mod_init();
simgrid::kernel::actor::create_maestro(maestro_code);
/* Prepare to display some more info when dying on Ctrl-C pressing */
- signal(SIGINT, inthandler);
+ std::signal(SIGINT, inthandler);
#ifndef _WIN32
install_segvhandler();
#endif
/* register a function to be called by SURF after the environment creation */
sg_platf_init();
- simgrid::s4u::onPlatformCreated.connect(SIMIX_post_create_environment);
- simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
- if (host.extension<simgrid::simix::Host>() == nullptr) // another callback to the same signal may have created it
- host.extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
- });
+ simgrid::s4u::on_platform_created.connect(SIMIX_post_create_environment);
- simgrid::surf::storageCreatedCallbacks.connect([](simgrid::surf::StorageImpl* storage) {
- sg_storage_t s = simgrid::s4u::Storage::byName(storage->getCname());
- xbt_assert(s != nullptr, "Storage not found for name %s", storage->getCname());
+ simgrid::s4u::Storage::on_creation.connect([](simgrid::s4u::Storage& storage) {
+ sg_storage_t s = simgrid::s4u::Storage::by_name(storage.get_cname());
+ xbt_assert(s != nullptr, "Storage not found for name %s", storage.get_cname());
});
}
- if (xbt_cfg_get_boolean("clean-atexit"))
+ if (simgrid::config::get_value<bool>("clean-atexit"))
atexit(SIMIX_clean);
if (_sg_cfg_exit_asap)
int smx_cleaned = 0;
/**
- * \ingroup SIMIX_API
- * \brief Clean the SIMIX simulation
+ * @ingroup SIMIX_API
+ * @brief Clean the SIMIX simulation
*
* This functions remove the memory used by SIMIX
*/
simix_global->process_to_destroy.clear();
simix_global->process_list.clear();
- xbt_os_mutex_destroy(simix_global->mutex);
- simix_global->mutex = nullptr;
#if SIMGRID_HAVE_MC
xbt_dynar_free(&simix_global->actors_vector);
xbt_dynar_free(&simix_global->dead_actors_vector);
#endif
/* Let's free maestro now */
- delete simix_global->maestro_process->context;
- simix_global->maestro_process->context = nullptr;
+ delete simix_global->maestro_process->context_;
+ simix_global->maestro_process->context_ = nullptr;
delete simix_global->maestro_process;
simix_global->maestro_process = nullptr;
simix_global = nullptr;
}
-
/**
- * \ingroup SIMIX_API
- * \brief A clock (in second).
+ * @ingroup SIMIX_API
+ * @brief A clock (in second).
*
- * \return Return the clock.
+ * @return Return the clock.
*/
double SIMIX_get_clock()
{
/** Wake up all processes waiting for a Surf action to finish */
static void SIMIX_wake_processes()
{
- for (auto const& model : *all_existing_models) {
+ for (auto const& model : all_existing_models) {
simgrid::kernel::resource::Action* action;
XBT_DEBUG("Handling the processes whose action failed (if any)");
- while ((action = surf_model_extract_failed_action_set(model))) {
+ while ((action = model->extract_failed_action())) {
XBT_DEBUG(" Handling Action %p",action);
- SIMIX_simcall_exit(static_cast<simgrid::kernel::activity::ActivityImpl*>(action->getData()));
+ SIMIX_simcall_exit(static_cast<simgrid::kernel::activity::ActivityImpl*>(action->get_data()));
}
XBT_DEBUG("Handling the processes whose action terminated normally (if any)");
- while ((action = surf_model_extract_done_action_set(model))) {
+ while ((action = model->extract_done_action())) {
XBT_DEBUG(" Handling Action %p",action);
- if (action->getData() == nullptr)
+ if (action->get_data() == nullptr)
XBT_DEBUG("probably vcpu's action %p, skip", action);
else
- SIMIX_simcall_exit(static_cast<simgrid::kernel::activity::ActivityImpl*>(action->getData()));
+ SIMIX_simcall_exit(static_cast<simgrid::kernel::activity::ActivityImpl*>(action->get_data()));
}
}
}
}
/**
- * \ingroup SIMIX_API
- * \brief Run the main simulation loop.
+ * @ingroup SIMIX_API
+ * @brief Run the main simulation loop.
*/
void SIMIX_run()
{
do {
XBT_DEBUG("New Schedule Round; size(queue)=%zu", simix_global->process_to_run.size());
+ if (simgrid::simix::breakpoint >= 0.0 && surf_get_clock() >= simgrid::simix::breakpoint) {
+ XBT_DEBUG("Breakpoint reached (%g)", simgrid::simix::breakpoint.get());
+ simgrid::simix::breakpoint = -1.0;
+#ifdef SIGTRAP
+ std::raise(SIGTRAP);
+#else
+ std::raise(SIGABRT);
+#endif
+ }
+
SIMIX_execute_tasks();
while (not simix_global->process_to_run.empty()) {
/* If only daemon processes remain, cancel their actions, mark them to die and reschedule them */
if (simix_global->process_list.size() == simix_global->daemons.size())
for (auto const& dmon : simix_global->daemons) {
- XBT_DEBUG("Kill %s", dmon->getCname());
+ XBT_DEBUG("Kill %s", dmon->get_cname());
SIMIX_process_kill(dmon, simix_global->maestro_process);
}
}
SIMIX_wake_processes();
} while (again);
- /* Autorestart all process */
- for (auto const& host : host_that_restart) {
- XBT_INFO("Restart processes on host %s", host->getCname());
- SIMIX_host_autorestart(host);
- }
- host_that_restart.clear();
-
/* Clean processes to destroy */
SIMIX_process_empty_trash();
XBT_DEBUG("### time %f, #processes %zu, #to_run %zu", time, simix_global->process_list.size(),
simix_global->process_to_run.size());
- if (simix_global->process_to_run.empty() && not simix_global->process_list.empty())
- simgrid::simix::onDeadlock();
-
} while (time > -1.0 || not simix_global->process_to_run.empty());
if (not simix_global->process_list.empty()) {
- TRACE_end();
-
- XBT_CRITICAL("Oops ! Deadlock or code not perfectly clean.");
+ if (simix_global->process_list.size() <= simix_global->daemons.size()) {
+ XBT_CRITICAL("Oops! Daemon actors cannot do any blocking activity (communications, synchronization, etc) "
+ "once the simulation is over. Please fix your on_exit() functions.");
+ } else {
+ XBT_CRITICAL("Oops! Deadlock or code not perfectly clean.");
+ }
SIMIX_display_process_status();
- simgrid::s4u::onDeadlock();
+ simgrid::s4u::on_deadlock();
xbt_abort();
}
- simgrid::s4u::onSimulationEnd();
+ simgrid::s4u::on_simulation_end();
}
/**
- * \brief Set the date to execute a function
+ * @brief Set the date to execute a function
*
* Set the date to execute the function on the surf.
- * \param date Date to execute function
- * \param callback Function to be executed
- * \param arg Parameters of the function
+ * @param date Date to execute function
+ * @param callback Function to be executed
+ * @param arg Parameters of the function
*
*/
smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg)
{
- smx_timer_t timer = new s_smx_timer_t(date, simgrid::xbt::makeTask([callback, arg]() { callback(arg); }));
+ smx_timer_t timer = new s_smx_timer_t(date, simgrid::xbt::make_task([callback, arg]() { callback(arg); }));
timer->handle_ = simix_timers.emplace(std::make_pair(date, timer));
return timer;
}
return timer ? timer->getDate() : 0;
}
-/**
- * \brief Registers a function to create a process.
- *
- * This function registers a function to be called
- * when a new process is created. The function has
- * to call SIMIX_process_create().
- * \param function create process function
- */
-void SIMIX_function_register_process_create(smx_creation_func_t function)
-{
- simix_global->create_process_function = function;
-}
-
-/**
- * \brief Registers a function to kill a process.
- *
- * This function registers a function to be called when a process is killed. The function has to call the
- * SIMIX_process_kill().
- *
- * \param function Kill process function
- */
-void SIMIX_function_register_process_kill(void_pfn_smxprocess_t function)
-{
- simix_global->kill_process_function = function;
-}
-
-/**
- * \brief Registers a function to cleanup a process.
- *
- * This function registers a user function to be called when a process ends properly.
- *
- * \param function cleanup process function
- */
-void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function)
-{
- simix_global->cleanup_process_function = function;
-}
-
-
void SIMIX_display_process_status()
{
int nbprocess = simix_global->process_list.size();
if (boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(process->waiting_synchro) != nullptr)
synchro_description = "I/O";
- XBT_INFO("Process %ld (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->pid,
- process->getCname(), process->host->getCname(), synchro_description, process->waiting_synchro.get(),
- process->waiting_synchro->name.c_str(), (int)process->waiting_synchro->state);
+ XBT_INFO("Process %ld (%s@%s): waiting for %s synchro %p (%s) in state %d to finish", process->pid_,
+ process->get_cname(), process->host_->get_cname(), synchro_description, process->waiting_synchro.get(),
+ process->waiting_synchro->name_.c_str(), (int)process->waiting_synchro->state_);
}
else {
- XBT_INFO("Process %ld (%s@%s)", process->pid, process->getCname(), process->host->getCname());
+ XBT_INFO("Process %ld (%s@%s)", process->pid_, process->get_cname(), process->host_->get_cname());
}
}
}
