-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2017. 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/functional.hpp>
-#include <simgrid/s4u/host.hpp>
+#include "simgrid/s4u/engine.hpp"
+#include "simgrid/s4u/host.hpp"
#include "src/surf/surf_interface.hpp"
#include "src/surf/storage_interface.hpp"
"Minimal Working Example (MWE) reproducing your problem and a full backtrace\n"
"of the fault captured with gdb or valgrind.\n",
smx_context_stack_size / 1024);
- if (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) {
- fprintf(stderr, "siginfo = {si_signo = %d, si_errno = %d, si_code = %d, si_addr = %p}\n",
- siginfo->si_signo, siginfo->si_errno, siginfo->si_code, siginfo->si_addr);
- }
} else if (siginfo->si_signo == SIGSEGV) {
fprintf(stderr, "Segmentation fault.\n");
#if HAVE_SMPI
*/
static void install_segvhandler()
{
- stack_t stack, old_stack;
+ stack_t stack;
+ stack_t old_stack;
stack.ss_sp = sigsegv_stack;
stack.ss_size = sizeof sigsegv_stack;
stack.ss_flags = 0;
sigaltstack(&old_stack, nullptr);
}
- struct sigaction action, old_action;
+ struct sigaction action;
+ struct sigaction old_action;
action.sa_sigaction = &segvhandler;
action.sa_flags = SA_ONSTACK | SA_RESETHAND | SA_SIGINFO;
sigemptyset(&action.sa_mask);
simgrid::simix::ActorImpl proc;
simix_global->process_to_run = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
simix_global->process_that_ran = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
- simix_global->process_list = xbt_swag_new(xbt_swag_offset(proc, process_hookup));
simix_global->process_to_destroy = xbt_swag_new(xbt_swag_offset(proc, destroy_hookup));
simix_global->maestro_process = nullptr;
simix_global->create_process_function = &SIMIX_process_create;
#endif
/* register a function to be called by SURF after the environment creation */
sg_platf_init();
- simgrid::surf::on_postparse.connect(SIMIX_post_create_environment);
+ simgrid::s4u::onPlatformCreated.connect(SIMIX_post_create_environment);
simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
host.extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
});
simgrid::surf::storageCreatedCallbacks.connect([](simgrid::surf::Storage* storage) {
- const char* name = storage->getName();
+ const char* name = storage->cname();
// TODO, create sg_storage_by_name
sg_storage_t s = xbt_lib_get_elm_or_null(storage_lib, name);
xbt_assert(s != nullptr, "Storage not found for name %s", name);
xbt_dynar_free(&simix_global->process_to_run);
xbt_dynar_free(&simix_global->process_that_ran);
xbt_swag_free(simix_global->process_to_destroy);
- xbt_swag_free(simix_global->process_list);
- simix_global->process_list = nullptr;
+ simix_global->process_list.clear();
simix_global->process_to_destroy = nullptr;
xbt_os_mutex_destroy(simix_global->mutex);
}
double time = 0;
- smx_actor_t process;
do {
XBT_DEBUG("New Schedule Round; size(queue)=%lu", xbt_dynar_length(simix_global->process_to_run));
*/
unsigned int iter;
+ smx_actor_t process;
xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
if (process->simcall.call != SIMCALL_NONE) {
SIMIX_simcall_handle(&process->simcall, 0);
}
time = SIMIX_timer_next();
- if (time > -1.0 || xbt_swag_size(simix_global->process_list) != 0) {
+ if (time > -1.0 || simix_global->process_list.empty() == false) {
XBT_DEBUG("Calling surf_solve");
time = surf_solve(time);
XBT_DEBUG("Moving time ahead : %g", time);
XBT_DEBUG("### time %f, empty %d", time, xbt_dynar_is_empty(simix_global->process_to_run));
if (xbt_dynar_is_empty(simix_global->process_to_run) &&
- xbt_swag_size(simix_global->process_list) != 0)
+ !simix_global->process_list.empty())
simgrid::simix::onDeadlock();
} while (time > -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run));
- if (xbt_swag_size(simix_global->process_list) != 0) {
+ if (simix_global->process_list.size() != 0) {
TRACE_end();
SIMIX_display_process_status();
xbt_abort();
}
+ simgrid::s4u::onSimulationEnd();
}
/**
void SIMIX_display_process_status()
{
- if (simix_global->process_list == nullptr) {
- return;
- }
-
- smx_actor_t process = nullptr;
- int nbprocess = xbt_swag_size(simix_global->process_list);
+ int nbprocess = simix_global->process_list.size();
XBT_INFO("%d processes are still running, waiting for something.", nbprocess);
/* List the process and their state */
XBT_INFO("Legend of the following listing: \"Process <pid> (<name>@<host>): <status>\"");
- xbt_swag_foreach(process, simix_global->process_list) {
+ for (auto kv : simix_global->process_list) {
+ smx_actor_t process = kv.second;
if (process->waiting_synchro) {