X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4c8f1898670317d0fa33bf1b1a904ea922b78cc..d4b84bf7c2cc1ffe1c73852ce1b6664930bc5f3a:/src/simix/smx_global.cpp diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index ca3e4b9edb..c84c5b77b7 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -54,19 +54,20 @@ XBT_ATTRIB_NORETURN static void inthandler(int) #ifndef _WIN32 static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/) { - if (siginfo->si_signo == SIGSEGV && siginfo->si_code == SEGV_ACCERR) { - fprintf(stderr, "Access violation detected.\n" - "This probably comes from a programming error in your code, or from a stack\n" - "overflow. If you are certain of your code, try increasing the stack size\n" - " --cfg=contexts/stack-size=XXX (current size is %u KiB).\n" - "\n" - "If it does not help, this may have one of the following causes:\n" - "a bug in SimGrid, a bug in the OS or a bug in a third-party libraries.\n" - "Failing hardware can sometimes generate such errors too.\n" - "\n" - "If you think you've found a bug in SimGrid, please report it along with a\n" - "Minimal Working Example (MWE) reproducing your problem and a full backtrace\n" - "of the fault captured with gdb or valgrind.\n", + if ((siginfo->si_signo == SIGSEGV && siginfo->si_code == SEGV_ACCERR) || siginfo->si_signo == SIGBUS) { + fprintf(stderr, + "Access violation or Bus error detected.\n" + "This probably comes from a programming error in your code, or from a stack\n" + "overflow. If you are certain of your code, try increasing the stack size\n" + " --cfg=contexts/stack-size=XXX (current size is %u KiB).\n" + "\n" + "If it does not help, this may have one of the following causes:\n" + "a bug in SimGrid, a bug in the OS or a bug in a third-party libraries.\n" + "Failing hardware can sometimes generate such errors too.\n" + "\n" + "If you think you've found a bug in SimGrid, please report it along with a\n" + "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); } else if (siginfo->si_signo == SIGSEGV) { fprintf(stderr, "Segmentation fault.\n"); @@ -113,14 +114,17 @@ static void install_segvhandler() action.sa_flags = SA_ONSTACK | SA_RESETHAND | SA_SIGINFO; sigemptyset(&action.sa_mask); - if (sigaction(SIGSEGV, &action, &old_action) == -1) { - XBT_WARN("Failed to register signal handler for SIGSEGV: %s", strerror(errno)); - return; - } - if ((old_action.sa_flags & SA_SIGINFO) || old_action.sa_handler != SIG_DFL) { - XBT_DEBUG("A signal handler was already installed for SIGSEGV (%p). Restore it.", - (old_action.sa_flags & SA_SIGINFO) ? (void*)old_action.sa_sigaction : (void*)old_action.sa_handler); - sigaction(SIGSEGV, &old_action, nullptr); + /* Linux tend to raise only SIGSEGV where other systems also raise SIGBUS on severe error */ + for (int sig : {SIGSEGV, SIGBUS}) { + if (sigaction(sig, &action, &old_action) == -1) { + XBT_WARN("Failed to register signal handler for signal %d: %s", sig, strerror(errno)); + continue; + } + if ((old_action.sa_flags & SA_SIGINFO) || old_action.sa_handler != SIG_DFL) { + XBT_DEBUG("A signal handler was already installed for signal %d (%p). Restore it.", sig, + (old_action.sa_flags & SA_SIGINFO) ? (void*)old_action.sa_sigaction : (void*)old_action.sa_handler); + sigaction(sig, &old_action, nullptr); + } } } @@ -238,7 +242,7 @@ void SIMIX_global_init(int *argc, char **argv) #endif /* register a function to be called by SURF after the environment creation */ sg_platf_init(); - simgrid::s4u::on_platform_created.connect(surf_presolve); + simgrid::s4u::Engine::on_platform_created.connect(surf_presolve); simgrid::s4u::Storage::on_creation.connect([](simgrid::s4u::Storage const& storage) { sg_storage_t s = simgrid::s4u::Storage::by_name(storage.get_name()); @@ -338,13 +342,13 @@ static void SIMIX_wake_processes() for (auto const& model : all_existing_models) { simgrid::kernel::resource::Action* action; - XBT_DEBUG("Handling the processes whose action failed (if any)"); + XBT_DEBUG("Handling the failed actions (if any)"); while ((action = model->extract_failed_action())) { XBT_DEBUG(" Handling Action %p",action); if (action->get_activity() != nullptr) simgrid::kernel::activity::ActivityImplPtr(action->get_activity())->post(); } - XBT_DEBUG("Handling the processes whose action terminated normally (if any)"); + XBT_DEBUG("Handling the terminated actions (if any)"); while ((action = model->extract_done_action())) { XBT_DEBUG(" Handling Action %p",action); if (action->get_activity() == nullptr) @@ -355,7 +359,7 @@ static void SIMIX_wake_processes() } } -/** Handle any pending timer */ +/** Handle any pending timer. Returns if something was actually run. */ static bool SIMIX_execute_timers() { bool result = false; @@ -426,7 +430,7 @@ void SIMIX_run() * - If a process is added because it's getting killed, its subsequent actions shouldn't matter * - If a process gets added to actors_to_run because one of their blocking action constituting the meat * of a simcall terminates, we're still good. Proof: - * - You are added from SIMIX_simcall_answer() only. When this function is called depends on the resource + * - You are added from ActorImpl::simcall_answer() only. When this function is called depends on the resource * kind (network, cpu, disk, whatever), but the same arguments hold. Let's take communications as an * example. * - For communications, this function is called from SIMIX_comm_finish(). @@ -467,8 +471,8 @@ void SIMIX_run() */ for (smx_actor_t const& process : simix_global->actors_that_ran) { - if (process->simcall.call != SIMCALL_NONE) { - SIMIX_simcall_handle(&process->simcall, 0); + if (process->simcall.call_ != SIMCALL_NONE) { + process->simcall_handle(0); } } @@ -522,34 +526,31 @@ void SIMIX_run() XBT_CRITICAL("Oops! Deadlock or code not perfectly clean."); } SIMIX_display_process_status(); - simgrid::s4u::on_deadlock(); + simgrid::s4u::Engine::on_deadlock(); xbt_abort(); } - simgrid::s4u::on_simulation_end(); + simgrid::s4u::Engine::on_simulation_end(); } -double SIMIX_timer_next() +double SIMIX_timer_next() // XBT_ATTRIB_DEPRECATED_v329 { return simgrid::simix::Timer::next(); } -smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg) +smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void* arg) // XBT_ATTRIB_DEPRECATED_v329 { return simgrid::simix::Timer::set(date, std::bind(callback, arg)); } -smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task&& callback) // deprecated -{ - return simgrid::simix::Timer::set(date, std::move(callback)); -} - /** @brief cancels a timer that was added earlier */ -void SIMIX_timer_remove(smx_timer_t timer) { +void SIMIX_timer_remove(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329 +{ timer->remove(); } /** @brief Returns the date at which the timer will trigger (or 0 if nullptr timer) */ -double SIMIX_timer_get_date(smx_timer_t timer) { +double SIMIX_timer_get_date(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329 +{ return timer ? timer->get_date() : 0; } @@ -561,38 +562,38 @@ void SIMIX_display_process_status() /* List the process and their state */ XBT_INFO("Legend of the following listing: \"Process (@): \""); for (auto const& kv : simix_global->process_list) { - smx_actor_t process = kv.second; + smx_actor_t actor = kv.second; - if (process->waiting_synchro) { + if (actor->waiting_synchro) { const char* synchro_description = "unknown"; // we don't care about the Activity type to get its name, use RawImpl const char* name = boost::static_pointer_cast>( - process->waiting_synchro) + actor->waiting_synchro) ->get_cname(); - if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) synchro_description = "execution"; - if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) synchro_description = "communication"; - if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) synchro_description = "sleeping"; - if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(actor->waiting_synchro) != nullptr) synchro_description = "synchronization"; - if (boost::dynamic_pointer_cast(process->waiting_synchro) != nullptr) + if (boost::dynamic_pointer_cast(actor->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->get_pid(), - process->get_cname(), process->get_host()->get_cname(), synchro_description, - process->waiting_synchro.get(), name, (int)process->waiting_synchro->state_); + XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %p (%s) in state %d to finish", actor->get_pid(), + actor->get_cname(), actor->get_host()->get_cname(), synchro_description, actor->waiting_synchro.get(), + name, (int)actor->waiting_synchro->state_); } else { - XBT_INFO("Process %ld (%s@%s)", process->get_pid(), process->get_cname(), process->get_host()->get_cname()); + XBT_INFO("Actor %ld (%s@%s)", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname()); } } }