Mercurial > octave
view liboctave/util/quit.cc @ 31633:d9970470108a stable
Remove several race conditions with signal handler (bug #61370).
This patch removes several race conditions between the interpreter and the
Ctrl-C signal handler, as described in more detail in bug #61370.
* libinterp/corefcn/sighandlers.h: Make can_interrupt atomic.
* libinterp/corefcn/sighandlers.cc: Make can_interrupt, signals_caught atomic,
use atomic value read for signals_caught, octave_interrupt_state,
change 1 to true.
* liboctave/util/quit.h: Move octave_interrupt_state and octave_signal_caught
to C++ only code, rewrite octave_quit() function, rewrite OCTAVE_QUIT macro
to use octave_quit_c() function.
* liboctave/util/quit.cc: Make octave_interrupt_state and octave_signal_caught
atomic, add new wrapper function octave_quit_c().
* libinterp/corefcn/interpreter.h: Make octave_initialized atomic.
* libinterp/corefcn/interpreter.cc: Make octave_initialized atomic,
change 0 to false.
* liboctave/util/action-container.h: New namespace "util", make m_val atomic.
* liboctave/util/oct-atomic.c: Reorder preprocessor if-elif-else ladder.
* liboctave/util/cmd-edit.cc: Change 0 to false.
author | Reinhard Resch <r_resch@a1.net> |
---|---|
date | Sat, 03 Dec 2022 10:36:59 -0500 |
parents | aac27ad79be6 |
children | 7d3467f8d713 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 2002-2022 The Octave Project Developers // // See the file COPYRIGHT.md in the top-level directory of this // distribution or <https://octave.org/copyright/>. // // This file is part of Octave. // // Octave is free software: you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // Octave is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with Octave; see the file COPYING. If not, see // <https://www.gnu.org/licenses/>. // //////////////////////////////////////////////////////////////////////// #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include <atomic> #include <cstring> #include <ostream> #include <sstream> #include <new> #include "quit.h" std::atomic<sig_atomic_t> octave_interrupt_state{0}; volatile std::atomic<bool> octave_signal_caught{false}; void (*octave_signal_hook) (void) = nullptr; void (*octave_interrupt_hook) (void) = nullptr; OCTAVE_BEGIN_NAMESPACE(octave) std::string execution_exception::stack_trace (void) const { std::size_t nframes = m_stack_info.size (); if (nframes == 0) return std::string (); std::ostringstream buf; buf << "error: called from\n"; for (const auto& frm : m_stack_info) { buf << " " << frm.fcn_name (); int line = frm.line (); if (line > 0) { buf << " at line " << line; int column = frm.column (); if (column > 0) buf << " column " << column; } buf << "\n"; } return buf.str (); } void execution_exception::display (std::ostream& os) const { if (! m_message.empty ()) { os << m_err_type << ": " << m_message; if (m_message.back () != '\n') { os << "\n"; std::string st = stack_trace (); if (! st.empty ()) os << st; } } } void octave_quit_c (void) { octave_quit (); } OCTAVE_END_NAMESPACE(octave) void octave_handle_signal (void) { if (octave_signal_hook) octave_signal_hook (); sig_atomic_t curr_interrupt_state = octave_interrupt_state.load (); while (curr_interrupt_state > 0 && ! octave_interrupt_state.compare_exchange_weak (curr_interrupt_state, -1)) ; if (curr_interrupt_state > 0) throw octave::interrupt_exception (); }