Mercurial > octave
view liboctave/util/oct-atomic.c @ 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 | 796f54d4ddbf |
children | 7d3467f8d713 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 2019-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 "oct-atomic.h" #if defined (__GNUC__) octave_idx_type octave_atomic_increment (octave_idx_type *x) { return __sync_add_and_fetch (x, 1); } octave_idx_type octave_atomic_decrement (octave_idx_type *x) { return __sync_sub_and_fetch (x, 1); } /* Some versions of GCC can't compile stdatomic.h with -fopenmp. */ #elif defined (OCTAVE_STDATOMIC_H_OK) # include <stdatomic.h> octave_idx_type octave_atomic_increment (octave_idx_type *x) { // This cast appears to be needed for some versions of clang. atomic_fetch_add ((_Atomic octave_idx_type *) x, 1); return *x; } octave_idx_type octave_atomic_decrement (octave_idx_type *x) { // This cast appears to be needed for some versions of clang. atomic_fetch_sub ((_Atomic octave_idx_type *) x, 1); return *x; } #elif defined (_MSC_VER) # include <intrin.h> octave_idx_type octave_atomic_increment (octave_idx_type *x) { #if defined (OCTAVE_ENABLE_64) return _InterlockedIncrement64 (x); #else return _InterlockedIncrement (x); #endif } octave_idx_type octave_atomic_decrement (octave_idx_type *x) { #if defined (OCTAVE_ENABLE_64) return _InterlockedDecrement64 (x); #else return _InterlockedDecrement (x); #endif } #else # error "Octave requires atomic integer increment and decrement functions" #endif