Extract SignalHandler class for re-use

source/client/service_main.cc

@@ -16,11 +16,6 @@
 namespace Nighthawk {
 namespace Client {
 
-namespace {
-std::function<void(int)> signal_handler_delegate;
-void signal_handler(int signal) { signal_handler_delegate(signal); }
-} // namespace
-
 ServiceMain::ServiceMain(int argc, const char** argv) {
   const char* descr = "L7 (HTTP/HTTPS/HTTP2) performance characterization tool.";
   TCLAP::CmdLine cmd(descr, ' ', VersionInfo::version()); // NOLINT
@@ -87,44 +82,15 @@ void ServiceMain::start() {
   }
   channel_ = grpc::CreateChannel(listener_bound_address_, grpc::InsecureChannelCredentials());
   stub_ = std::make_unique<nighthawk::client::NighthawkService::Stub>(channel_);
-  pipe_fds_.resize(2);
-  // The shutdown thread will be notified of by our signal handler and take it from there.
-  RELEASE_ASSERT(pipe(pipe_fds_.data()) == 0, "pipe failed");
-
-  shutdown_thread_ = std::thread([this]() {
-    int tmp;
-    RELEASE_ASSERT(read(pipe_fds_[0], &tmp, sizeof(int)) >= 0, "read failed");
-    RELEASE_ASSERT(close(pipe_fds_[0]) == 0, "read side close failed");
-    RELEASE_ASSERT(close(pipe_fds_[1]) == 0, "write side close failed");
-    pipe_fds_.clear();
-    server_->Shutdown();
-  });
+  signal_handler_ = std::make_unique<SignalHandler>([this]() { server_->Shutdown(); });
 }
 
 void ServiceMain::wait() {
-  signal_handler_delegate = [this](int) { onSignal(); };
-  signal(SIGTERM, signal_handler);
-  signal(SIGINT, signal_handler);
   server_->Wait();
   shutdown();
 }
 
-void ServiceMain::onSignal() { initiateShutdown(); }
-
-void ServiceMain::initiateShutdown() {
-  if (pipe_fds_.size() == 2) {
-    const int tmp = 0;
-    RELEASE_ASSERT(write(pipe_fds_[1], &tmp, sizeof(int)) == sizeof(int), "write failed");
-  }
-}
-
-void ServiceMain::shutdown() {
-  initiateShutdown();
-  if (shutdown_thread_.joinable()) {
-    shutdown_thread_.join();
-  }
-  ENVOY_LOG(info, "Nighthawk grpc service exits");
-}
+void ServiceMain::shutdown() { ENVOY_LOG(info, "Nighthawk grpc service exits"); }
 
 } // namespace Client
 } // namespace Nighthawk

source/client/service_main.h

@@ -12,6 +12,8 @@
 
 #include "api/client/service.pb.h"
 
+#include "common/signal_handler.h"
+
 #include "client/service_impl.h"
 
 #include "tclap/CmdLine.h"
@@ -37,17 +39,6 @@ class ServiceMain : public Envoy::Logger::Loggable<Envoy::Logger::Id::main> {
   static std::string appendDefaultPortIfNeeded(absl::string_view host_and_maybe_port);
 
 private:
-  /**
-   * Notifies the thread responsible for shutting down the server that it is time to do so, if
-   * needed. Safe to use in signal handling, and non-blocking.
-   */
-  void initiateShutdown();
-
-  /**
-   * Fires on signal reception.
-   */
-  void onSignal();
-
   grpc::ServerBuilder builder_;
   std::unique_ptr<grpc::Service> service_;
   std::unique_ptr<grpc::Server> server_;
@@ -56,12 +47,7 @@ class ServiceMain : public Envoy::Logger::Loggable<Envoy::Logger::Id::main> {
   int listener_port_{-1};
   std::string listener_bound_address_;
   std::string listener_output_path_;
-  // Signal handling needs to be lean so we can't directly initiate shutdown while handling a
-  // signal. Therefore we write a bite to a this pipe to propagate signal reception. Subsequently,
-  // the read side will handle the actual shut down of the gRPC service without having to worry
-  // about signal-safety.
-  std::vector<int> pipe_fds_;
-  std::thread shutdown_thread_;
+  SignalHandlerPtr signal_handler_;
 };
 
 } // namespace Client

source/common/BUILD

@@ -67,6 +67,7 @@ envoy_cc_library(
         "phase_impl.cc",
         "rate_limiter_impl.cc",
         "sequencer_impl.cc",
+        "signal_handler.cc",
         "statistic_impl.cc",
         "termination_predicate_impl.cc",
         "uri_impl.cc",
@@ -81,6 +82,7 @@ envoy_cc_library(
         "platform_util_impl.h",
         "rate_limiter_impl.h",
         "sequencer_impl.h",
+        "signal_handler.h",
         "statistic_impl.h",
         "termination_predicate_impl.h",
         "uri_impl.h",

source/common/signal_handler.cc

@@ -0,0 +1,50 @@
+#include "common/signal_handler.h"
+
+#include <csignal>
+
+#include "external/envoy/source/common/common/assert.h"
+#include "external/envoy/source/common/common/macros.h"
+
+namespace Nighthawk {
+
+namespace {
+std::function<void(int)> signal_handler_delegate;
+void signal_handler(int signal) { signal_handler_delegate(signal); }
+} // namespace
+
+SignalHandler::SignalHandler(const std::function<void()>& signal_callback) {
+  pipe_fds_.resize(2);
+  // The shutdown thread will be notified of by our signal handler and take it from there.
+  RELEASE_ASSERT(pipe(pipe_fds_.data()) == 0, "pipe failed");
+
+  shutdown_thread_ = std::thread([this, signal_callback]() {
+    int tmp;
+    RELEASE_ASSERT(read(pipe_fds_[0], &tmp, sizeof(int)) >= 0, "read failed");
+    RELEASE_ASSERT(close(pipe_fds_[0]) == 0, "read side close failed");
+    RELEASE_ASSERT(close(pipe_fds_[1]) == 0, "write side close failed");
+    pipe_fds_.clear();
+    signal_callback();
+  });
+
+  signal_handler_delegate = [this](int) { onSignal(); };
+  signal(SIGTERM, signal_handler);
+  signal(SIGINT, signal_handler);
+}
+
+SignalHandler::~SignalHandler() {
+  initiateShutdown();
+  if (shutdown_thread_.joinable()) {
+    shutdown_thread_.join();
+  }
+}
+
+void SignalHandler::initiateShutdown() {
+  if (pipe_fds_.size() == 2) {
+    const int tmp = 0;
+    RELEASE_ASSERT(write(pipe_fds_[1], &tmp, sizeof(int)) == sizeof(int), "write failed");
+  }
+}
+
+void SignalHandler::onSignal() { initiateShutdown(); }
+
+} // namespace Nighthawk

source/common/signal_handler.h

@@ -0,0 +1,44 @@
+#pragma once
+
+#include <functional>
+#include <memory>
+#include <thread>
+#include <vector>
+
+#include "external/envoy/source/common/common/logger.h"
+
+namespace Nighthawk {
+
+using SignalCallback = std::function<void()>;
+
+class SignalHandler final : public Envoy::Logger::Loggable<Envoy::Logger::Id::main> {
+public:
+  SignalHandler(const SignalCallback& signal_callback);
+  SignalHandler(SignalHandler const&) = delete;
+  void operator=(SignalHandler const&) = delete;
+  ~SignalHandler();
+
+private:
+  /**
+   * Fires on signal reception.
+   */
+  void onSignal();
+
+  /**
+   * Notifies the thread responsible for shutting down the server that it is time to do so, if
+   * needed. Safe to use in signal handling, and non-blocking.
+   */
+  void initiateShutdown();
+
+  std::thread shutdown_thread_;
+
+  // Signal handling needs to be lean so we can't directly initiate shutdown while handling a
+  // signal. Therefore we write a bite to a this pipe to propagate signal reception. Subsequently,
+  // the read side will handle the actual shut down of the gRPC service without having to worry
+  // about signal-safety.
+  std::vector<int> pipe_fds_;
+};
+
+using SignalHandlerPtr = std::unique_ptr<SignalHandler>;
+
+} // namespace Nighthawk