From 4e1d72e7f0fe36ba31081b7c0fa14c407174e338 Mon Sep 17 00:00:00 2001
From: Stephane Janel <stephane.janel@amadeus.com>
Date: Wed, 28 Aug 2024 20:27:54 +0200
Subject: [PATCH] Split signal handler process in dedicated file

---
 .../src/coincenter-commands-processor.cpp     | 25 ++---------
 src/tech/include/signal-handler.hpp           |  8 ++++
 src/tech/src/signal-handler.cpp               | 42 +++++++++++++++++++
 3 files changed, 53 insertions(+), 22 deletions(-)
 create mode 100644 src/tech/include/signal-handler.hpp
 create mode 100644 src/tech/src/signal-handler.cpp

diff --git a/src/engine/src/coincenter-commands-processor.cpp b/src/engine/src/coincenter-commands-processor.cpp
index dd9d2f79..e0071411 100644
--- a/src/engine/src/coincenter-commands-processor.cpp
+++ b/src/engine/src/coincenter-commands-processor.cpp
@@ -2,7 +2,6 @@
 
 #include <algorithm>
 #include <array>
-#include <csignal>
 #include <span>
 #include <thread>
 #include <utility>
@@ -29,6 +28,7 @@
 #include "queryresultprinter.hpp"
 #include "queryresulttypes.hpp"
 #include "replay-options.hpp"
+#include "signal-handler.hpp"
 #include "timedef.hpp"
 #include "transferablecommandresult.hpp"
 
@@ -51,30 +51,11 @@ void FillConversionTransferableCommandResults(const MonetaryAmountPerExchange &m
   }
 }
 
-volatile sig_atomic_t g_signalStatus = 0;
-
 }  // namespace
 
-// According to the standard, 'SignalHandler' function should have C linkage:
-// https://en.cppreference.com/w/cpp/utility/program/signal
-// Thus it's not possible to use a lambda and pass some
-// objects to it. This is why for this rare occasion we will rely on a static variable. This solution has been inspired
-// by: https://wiki.sei.cmu.edu/confluence/display/cplusplus/MSC54-CPP.+A+signal+handler+must+be+a+plain+old+function
-extern "C" void SignalHandler(int sigNum) {
-  log::warn("Signal {} received, will stop after current request", sigNum);
-  g_signalStatus = sigNum;
-
-  // Revert to standard signal handler (to allow for standard kill in case program does not react)
-  std::signal(sigNum, SIG_DFL);
-}
-
 CoincenterCommandsProcessor::CoincenterCommandsProcessor(Coincenter &coincenter)
     : _coincenter(coincenter),
-      _queryResultPrinter(coincenter.coincenterInfo().apiOutputType(), coincenter.coincenterInfo().loggingInfo()) {
-  // Register the signal handler to gracefully shutdown the main loop for repeated requests.
-  std::signal(SIGINT, SignalHandler);
-  std::signal(SIGTERM, SignalHandler);
-}
+      _queryResultPrinter(coincenter.coincenterInfo().apiOutputType(), coincenter.coincenterInfo().loggingInfo()) {}
 
 int CoincenterCommandsProcessor::process(const CoincenterCommands &coincenterCommands) {
   const auto commands = coincenterCommands.commands();
@@ -83,7 +64,7 @@ int CoincenterCommandsProcessor::process(const CoincenterCommands &coincenterCom
 
   int nbCommandsProcessed{};
   TimePoint lastCommandTime;
-  for (int repeatPos{}; repeatPos != nbRepeats && g_signalStatus == 0; ++repeatPos) {
+  for (int repeatPos{}; repeatPos != nbRepeats && !IsStopRequested(); ++repeatPos) {
     const auto earliestTimeNextCommand = lastCommandTime + repeatTime;
     const bool doLog = nbRepeats != 1 && (repeatPos < 100 || repeatPos % 100 == 0);
 
diff --git a/src/tech/include/signal-handler.hpp b/src/tech/include/signal-handler.hpp
new file mode 100644
index 00000000..e640b665
--- /dev/null
+++ b/src/tech/include/signal-handler.hpp
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace cct {
+
+// Tells whether a stop signal has been requested through a signal (Ctrl+C for instance)
+bool IsStopRequested();
+
+}  // namespace cct
diff --git a/src/tech/src/signal-handler.cpp b/src/tech/src/signal-handler.cpp
new file mode 100644
index 00000000..ebd5970d
--- /dev/null
+++ b/src/tech/src/signal-handler.cpp
@@ -0,0 +1,42 @@
+#include "signal-handler.hpp"
+
+#include <csignal>
+
+#include "cct_log.hpp"
+
+namespace {
+
+extern "C" void SignalHandler(int sigNum);
+
+sig_atomic_t InitializeSignalStatus() {
+  // Register the signal handler to gracefully shutdown the main loop for repeated requests.
+  std::signal(SIGINT, SignalHandler);
+  std::signal(SIGTERM, SignalHandler);
+  std::signal(SIGQUIT, SignalHandler);
+
+  return 0;
+}
+
+volatile sig_atomic_t g_signalStatus = InitializeSignalStatus();
+
+}  // namespace
+
+// According to the standard, 'SignalHandler' function should have C linkage:
+// https://en.cppreference.com/w/cpp/utility/program/signal
+// Thus it's not possible to use a lambda and pass some
+// objects to it. This is why for this rare occasion we will rely on a static variable. This solution has been inspired
+// by: https://wiki.sei.cmu.edu/confluence/display/cplusplus/MSC54-CPP.+A+signal+handler+must+be+a+plain+old+function
+extern "C" void SignalHandler(int sigNum) {
+  cct::log::warn("Signal {} received, will stop after current command", sigNum);
+
+  g_signalStatus = sigNum;
+
+  // Revert to standard signal handler (to allow for standard kill in case program does not react)
+  std::signal(sigNum, SIG_DFL);
+}
+
+namespace cct {
+
+bool IsStopRequested() { return g_signalStatus != 0; }
+
+}  // namespace cct
\ No newline at end of file