# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1670096733 18000
# Node ID b69d89906ae958689d76d6050f548ef8fa3067b6
# Parent  06a5dd3c7358c2af40bfb0229e79c85108b915dd# Parent  7d3467f8d713c10391bdd5efce0ba707e749aa00
maint: Merge stable to default.

diff -r 06a5dd3c7358 -r b69d89906ae9 libinterp/corefcn/interpreter.cc
--- a/libinterp/corefcn/interpreter.cc	Sat Dec 03 10:54:32 2022 -0500
+++ b/libinterp/corefcn/interpreter.cc	Sat Dec 03 14:45:33 2022 -0500
@@ -91,7 +91,7 @@
 bool octave_interpreter_ready = false;
 
 // TRUE means we've processed all the init code and we are good to go.
-std::atomic<bool> octave_initialized{false};
+bool octave_initialized = false;
 
 OCTAVE_BEGIN_NAMESPACE(octave)
 
@@ -1950,7 +1950,7 @@
 
   can_interrupt = true;
   octave_interrupt_state = 0;
-  octave_signal_caught = false;
+  octave_signal_caught = 0;
   octave_restore_signal_mask ();
   catch_interrupts ();
 }
diff -r 06a5dd3c7358 -r b69d89906ae9 libinterp/corefcn/interpreter.h
--- a/libinterp/corefcn/interpreter.h	Sat Dec 03 10:54:32 2022 -0500
+++ b/libinterp/corefcn/interpreter.h	Sat Dec 03 14:45:33 2022 -0500
@@ -28,7 +28,6 @@
 
 #include "octave-config.h"
 
-#include <atomic>
 #include <map>
 #include <set>
 #include <stack>
@@ -67,7 +66,7 @@
 extern OCTINTERP_API bool octave_interpreter_ready;
 
 // TRUE means we've processed all the init code and we are good to go.
-extern OCTINTERP_API std::atomic<bool> octave_initialized;
+extern OCTINTERP_API bool octave_initialized;
 
 #include "oct-time.h"
 
diff -r 06a5dd3c7358 -r b69d89906ae9 libinterp/corefcn/sighandlers.cc
--- a/libinterp/corefcn/sighandlers.cc	Sat Dec 03 10:54:32 2022 -0500
+++ b/libinterp/corefcn/sighandlers.cc	Sat Dec 03 14:45:33 2022 -0500
@@ -27,7 +27,6 @@
 #  include "config.h"
 #endif
 
-#include <atomic>
 #include <csignal>
 #include <cstdlib>
 
@@ -66,7 +65,7 @@
 int pipe_handler_error_count = 0;
 
 // TRUE means we can be interrupted.
-std::atomic<bool> can_interrupt{false};
+bool can_interrupt = false;
 
 // TRUE means we should try to enter the debugger on SIGINT.
 bool Vdebug_on_interrupt = false;
@@ -83,7 +82,7 @@
 static bool Vsigterm_dumps_octave_core = true;
 
 // List of signals we have caught since last call to signal_handler.
-static std::atomic<bool> *signals_caught = nullptr;
+static bool *signals_caught = nullptr;
 
 static void
 my_friendly_exit (int sig, bool save_vars = true)
@@ -195,10 +194,10 @@
 
   for (int sig = 0; sig < octave_num_signals (); sig++)
     {
-      bool expected = true;
+      if (signals_caught[sig])
+        {
+          signals_caught[sig] = false;
 
-      if (signals_caught[sig].compare_exchange_strong (expected, false))
-        {
           if ((have_sigchld && sig == sigchld)
               || (have_sigcld && sig == sigcld))
             {
@@ -224,22 +223,9 @@
               // FIXME: is this really needed?  Does it do anything
               // useful now?
 
-              const int curr_pipe_handler_error_count = pipe_handler_error_count++;
-
-              if (curr_pipe_handler_error_count > 100)
-                {
-                  sig_atomic_t curr_interrupt_state
-                  = octave_interrupt_state.load();
-
-                  sig_atomic_t new_interrupt_state;
-
-                  do
-                    new_interrupt_state = curr_interrupt_state + 1;
-                  while (curr_interrupt_state >= 0 &&
-                     ! octave_interrupt_state.compare_exchange_weak
-                     (curr_interrupt_state, new_interrupt_state));
-                }
-
+              if (pipe_handler_error_count++ > 100
+                  && octave_interrupt_state >= 0)
+                octave_interrupt_state++;
             }
           else if (have_sighup && sig == sighup)
             my_friendly_exit (sighup, Vsighup_dumps_octave_core);
@@ -290,7 +276,7 @@
   // signal watcher thread so it should probably be more careful about
   // how it accesses global objects.
 
-  octave_signal_caught = true;
+  octave_signal_caught = 1;
 
   signals_caught[sig] = true;
 
@@ -310,7 +296,7 @@
 
       if (can_interrupt)
         {
-          octave_signal_caught = true;
+          octave_signal_caught = 1;
           octave_interrupt_state++;
         }
     }
@@ -379,7 +365,7 @@
 install_signal_handlers (void)
 {
   if (! signals_caught)
-    signals_caught = new std::atomic<bool> [octave_num_signals ()];
+    signals_caught = new bool [octave_num_signals ()];
 
   for (int i = 0; i < octave_num_signals (); i++)
     signals_caught[i] = false;
diff -r 06a5dd3c7358 -r b69d89906ae9 libinterp/corefcn/sighandlers.h
--- a/libinterp/corefcn/sighandlers.h	Sat Dec 03 10:54:32 2022 -0500
+++ b/libinterp/corefcn/sighandlers.h	Sat Dec 03 14:45:33 2022 -0500
@@ -36,8 +36,6 @@
 #if ! defined (octave_sighandlers_h)
 #define octave_sighandlers_h 1
 
-#include <atomic>
-
 #include "octave-config.h"
 
 #include "child-list.h"
@@ -58,7 +56,7 @@
 extern int pipe_handler_error_count;
 
 // TRUE means we can be interrupted.
-extern OCTINTERP_API std::atomic<bool> can_interrupt;
+extern OCTINTERP_API bool can_interrupt;
 
 extern OCTINTERP_API sig_handler *
 set_signal_handler (int sig, sig_handler *h,
diff -r 06a5dd3c7358 -r b69d89906ae9 liboctave/util/action-container.h
--- a/liboctave/util/action-container.h	Sat Dec 03 10:54:32 2022 -0500
+++ b/liboctave/util/action-container.h	Sat Dec 03 14:45:33 2022 -0500
@@ -28,7 +28,6 @@
 
 #include "octave-config.h"
 
-#include <atomic>
 #include <cstddef>
 #include <functional>
 
@@ -40,22 +39,6 @@
 
 OCTAVE_BEGIN_NAMESPACE(octave)
 
-OCTAVE_BEGIN_NAMESPACE(util)
-
-template <typename T>
-struct atomic_traits
-{
-  typedef T type;
-};
-
-template <typename T>
-struct atomic_traits<std::atomic<T>>
-{
-  typedef T type;
-};
-
-OCTAVE_END_NAMESPACE(util)
-
 class
 action_container
 {
@@ -123,8 +106,7 @@
 
   private:
 
-    T *m_ptr;
-    typename util::atomic_traits<T>::type m_val;
+    T *m_ptr, m_val;
   };
 
   // Deletes a class allocated using new.
diff -r 06a5dd3c7358 -r b69d89906ae9 liboctave/util/cmd-edit.cc
--- a/liboctave/util/cmd-edit.cc	Sat Dec 03 10:54:32 2022 -0500
+++ b/liboctave/util/cmd-edit.cc	Sat Dec 03 14:45:33 2022 -0500
@@ -785,7 +785,7 @@
 void
 gnu_readline::do_handle_interrupt_signal (void)
 {
-  octave_signal_caught = false;
+  octave_signal_caught = 0;
   octave_interrupt_state = 0;
 
   ::octave_rl_recover_from_interrupt ();
diff -r 06a5dd3c7358 -r b69d89906ae9 liboctave/util/oct-atomic.c
--- a/liboctave/util/oct-atomic.c	Sat Dec 03 10:54:32 2022 -0500
+++ b/liboctave/util/oct-atomic.c	Sat Dec 03 14:45:33 2022 -0500
@@ -29,23 +29,9 @@
 
 #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)
+#if defined (OCTAVE_STDATOMIC_H_OK)
 #  include <stdatomic.h>
 
 octave_idx_type
@@ -66,6 +52,20 @@
   return *x;
 }
 
+#elif 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);
+}
+
 #elif defined (_MSC_VER)
 #  include <intrin.h>
 
diff -r 06a5dd3c7358 -r b69d89906ae9 liboctave/util/quit.cc
--- a/liboctave/util/quit.cc	Sat Dec 03 10:54:32 2022 -0500
+++ b/liboctave/util/quit.cc	Sat Dec 03 14:45:33 2022 -0500
@@ -27,7 +27,6 @@
 #  include "config.h"
 #endif
 
-#include <atomic>
 #include <cstring>
 
 #include <ostream>
@@ -36,9 +35,9 @@
 
 #include "quit.h"
 
-std::atomic<sig_atomic_t> octave_interrupt_state{0};
+sig_atomic_t octave_interrupt_state = 0;
 
-volatile std::atomic<bool> octave_signal_caught{false};
+volatile sig_atomic_t octave_signal_caught = 0;
 
 void (*octave_signal_hook) (void) = nullptr;
 void (*octave_interrupt_hook) (void) = nullptr;
@@ -96,11 +95,6 @@
     }
 }
 
-void octave_quit_c (void)
-{
-  octave_quit ();
-}
-
 OCTAVE_END_NAMESPACE(octave)
 
 void
@@ -109,12 +103,10 @@
   if (octave_signal_hook)
     octave_signal_hook ();
 
-  sig_atomic_t curr_interrupt_state = octave_interrupt_state.load ();
+  if (octave_interrupt_state > 0)
+    {
+      octave_interrupt_state = -1;
 
-  while (curr_interrupt_state > 0 &&
-    ! octave_interrupt_state.compare_exchange_weak (curr_interrupt_state, -1))
-    ;
-
-  if (curr_interrupt_state > 0)
-    throw octave::interrupt_exception ();
+      throw octave::interrupt_exception ();
+    }
 }
diff -r 06a5dd3c7358 -r b69d89906ae9 liboctave/util/quit.h
--- a/liboctave/util/quit.h	Sat Dec 03 10:54:32 2022 -0500
+++ b/liboctave/util/quit.h	Sat Dec 03 14:45:33 2022 -0500
@@ -30,7 +30,6 @@
 
 /* The signal header is just needed for the sig_atomic_t type.  */
 #if defined (__cplusplus)
-#  include <atomic>
 #  include <csignal>
 #  include <iosfwd>
 #  include <list>
@@ -224,14 +223,9 @@
     0: no interrupt pending
   < 0: handling interrupt
 */
-
-#if defined (__cplusplus)
+extern OCTAVE_API sig_atomic_t octave_interrupt_state;
 
-extern OCTAVE_API std::atomic<int> octave_interrupt_state;
-
-extern OCTAVE_API volatile std::atomic<bool> octave_signal_caught;
-
-#endif
+extern OCTAVE_API volatile sig_atomic_t octave_signal_caught;
 
 extern OCTAVE_API void octave_handle_signal (void);
 
@@ -239,19 +233,27 @@
 
 inline void octave_quit (void)
 {
-  bool expected = true;
-
-  if (octave_signal_caught.compare_exchange_strong (expected, false))
-    octave_handle_signal ();
+  if (octave_signal_caught)
+    {
+      octave_signal_caught = 0;
+      octave_handle_signal ();
+    }
 }
 
 #define OCTAVE_QUIT octave_quit ()
 
 #else
 
-extern OCTAVE_API void octave_quit_c (void);
-#define OCTAVE_QUIT octave_quit_c ()
-
+#define OCTAVE_QUIT                             \
+  do                                            \
+    {                                           \
+      if (octave_signal_caught)                 \
+        {                                       \
+          octave_signal_caught = 0;             \
+          octave_handle_signal ();              \
+        }                                       \
+    }                                           \
+  while (0)
 #endif
 
 /* The following macros are obsolete.  Interrupting immediately by