Shutdown marker displaced to runtime

diff --git a/conf/conf.c b/conf/conf.c
index 2002fe69fecb0b81a4237be831bfd4f16c418215..f15d90c30c291a84aa9d9746f5dcd99127a82252 100644 (file)
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -75,7 +75,6 @@ static void config_done(void);
 static timer *config_timer;            /* Timer for scheduled configuration rollback */
 
 /* These are public just for cmd_show_status(), should not be accessed elsewhere */
-int shutting_down;                     /* Shutdown requested, do not accept new config changes */
 int configuring;                       /* Reconfiguration is running */
 int undo_available;                    /* Undo was not requested from last reconfiguration */
 /* Note that both shutting_down and undo_available are related to requests, not processing */

diff --git a/lib/runtime.c b/lib/runtime.c
index cf40c124f06b9fd46afd209a030ea362d975cdd7..f2507de9ccde0f88d1daf64cf1be0f69ff8b07a3 100644 (file)
--- a/lib/runtime.c
+++ b/lib/runtime.c
@@ -9,6 +9,8 @@
 
 #include "lib/runtime.h"
 
+int shutting_down = 0;
+
 struct global_runtime global_runtime_initial = {
   .tf_log = {
     .fmt1 = "%F %T.%3f",

diff --git a/lib/runtime.h b/lib/runtime.h
index 455f89a803342508d40ccf233dda3600ff2f9649..450eb26afdacd9558231ac6defbc4826420f7d17 100644 (file)
--- a/lib/runtime.h
+++ b/lib/runtime.h
@@ -9,6 +9,10 @@
 
 #include "lib/timer.h"
 
+/* Shutdown requested, behave accordingly.
+ * Initially zero, once set to one, never reset. */
+extern int shutting_down;
+
 /* I/O loops log information about task scheduling */
 enum latency_debug_flags {
   DL_PING = 1,