Registry now supports command line options and sigs

Author: StevenAWhite

projects/CMakeLists.txt

@@ -29,6 +29,9 @@ else()
     endforeach(OUTPUTCONFIG)
 endif()
 
+set(Boost_USE_STATIC_LIBS  OFF)
+find_package(Boost COMPONENTS system thread program_options signals log REQUIRED)
+
 ###############################################################################
 # Step 2: Project Includes are generally order dependent.  So manually maintain
 #         this list

projects/libpfc_net/CMakeLists.txt

@@ -23,8 +23,6 @@ set(${PREFIX}_UNIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/unit" PARENT_SCOPE)
 # Requirments
 ###############################################################################
 find_package(nanomsg REQUIRED)
-set(Boost_USE_STATIC_LIBS  OFF)
-find_package(Boost COMPONENTS system thread REQUIRED)
 ###############################################################################
 #Code Generation
 ###############################################################################
@@ -96,6 +94,7 @@ set(${PREFIX}_LIBS
       ${CMAKE_DL_LIBS}
 	  nanomsg
 	  Boost::disable_autolinking
+	  Boost::dynamic_linking
 	  Boost::system
 	  Boost::thread
 )

projects/libpfc_net/cpp/net/Multicast_Receiver.cpp

@@ -4,6 +4,8 @@
 
 #include <boost/asio/ip/multicast.hpp>
 #include <boost/asio/ip/udp.hpp>
+#include <boost/asio/signal_set.hpp>
+#include <boost/log/trivial.hpp>
 #include <boost/system/error_code.hpp>
 
 namespace pfc {
@@ -129,8 +131,8 @@ void Multicast_Receiver::async_receive(std::function<void(std::istream&)> proces
 //! This function waits until no pending work is done.
 void Multicast_Receiver::join()
 {
-  if( _impl->multicast_async_receive_thread.joinable() )
-  _impl->multicast_async_receive_thread.join();
+  if (_impl->multicast_async_receive_thread.joinable())
+    _impl->multicast_async_receive_thread.join();
 }
 //-----------------------------------------------------------------------------
 //! This function waits until no pending work is done.

projects/libpfc_net/cpp/net/Multicast_Sender.cpp

@@ -8,6 +8,7 @@
 #include <boost/system/error_code.hpp>
 
 #include <boost/asio/buffered_stream.hpp>
+#include <boost/asio/signal_set.hpp>
 #include <boost/asio/streambuf.hpp>
 
 namespace pfc {

projects/registry_server/CMakeLists.txt

@@ -91,6 +91,9 @@ set(${PREFIX}_LIBS
       ${CMAKE_THREAD_LIBS_INIT}
       ${CMAKE_DL_LIBS}
 	  sustain::pfc_nw
+	  Boost::program_options
+	  Boost::log
+
 )
 
 set(${PREFIX}_LIBS ${${PREFIX}_LIBS} PARENT_SCOPE)

projects/registry_server/cpp/Registry.cpp

@@ -94,6 +94,11 @@ void Registry::start()
   using namespace std::placeholders;
   _impl->subscription_listiner.async_receive(std::bind(&Implementation::process_subscription_message, _impl.get(), _1));
 }
+void Registry::wait()
+{
+  _impl->subscription_listiner.join();
+  _impl->service_broadcaster.join();
+}
 //-----------------------------------------------------------------------------
 void Registry::shutdown()
 {

projects/registry_server/cpp/Registry.h

@@ -25,6 +25,7 @@ class Registry {
   ~Registry();
 
   void start();
+  void wait();
   void shutdown();
 
   bool is_valid();

projects/registry_server/cpp/registry_client_main.cpp

@@ -2,29 +2,49 @@
 #include <thread>
 
 #include "Registry.h"
-#include <boost/system/error_code.hpp>
+
+#include <boost/log/trivial.hpp>
+#include <boost/program_options.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/signal_set.hpp>
 
 int main(int argc, const char* argv[])
 {
+  namespace bpo = boost::program_options;
+  bpo::options_description options("Allowed options");
+  options.add_options()("help", "Produce help message") //
+    ("bind", bpo::value<std::string>()->default_value("0::0"), "Server port bind address [0::0]") //
+    ("multicast", bpo::value<std::string>()->default_value("ff31::8000:1234"), "Server multicast broadcast address [ff31::8000:1234]");
+
+  bpo::variables_map vm;
+  bpo::store(bpo::parse_command_line(argc, argv, options), vm);
+  bpo::notify(vm);
+
   std::unique_ptr<pfc::Registry> reg;
   try {
-    reg = std::make_unique<pfc::Registry>("0::0", "ff31::8000:1234");
+    reg = std::make_unique<pfc::Registry>(vm["bind"].as<std::string>(), vm["multicast"].as<std::string>());
 
-  } catch (boost::system::error_code& e) {
-    std::cout << e << std::endl;
-  } catch (...) {
-    std::cout << "Unknown Exception Caught\n";
+  } catch (std::exception& e) {
+    std::cerr << e.what();
   }
 
-  if (reg) {
-    reg->start();
-  }
+  boost::asio::io_context context;
+  boost::asio::signal_set signals(context);
 
-  std::cout << "Sleeping for 15 seconds\n";
-  std::this_thread::sleep_for(std::chrono::seconds(15));
-  std::cout << "Done Sleeping\n";
+  signals.add(SIGINT);
+  signals.add(SIGTERM);
+#if defined(SIGQUIT)
+  signals_.add(SIGQUIT);
+#endif
+  signals.async_wait([&](const boost::system::error_code& /*ec*/, int /*no*/) {
+    BOOST_LOG_TRIVIAL(info) << "Stopping PFC Registry\n";
+    reg->shutdown();
+  });
 
+  // Start an asynchronous wait for one of the signals to occur.
   if (reg) {
-    reg->shutdown();
+    BOOST_LOG_TRIVIAL(info) << "Starting PFC Registry on " << vm["bind"].as<std::string>() << " broadcasting on " << vm["multicast"].as<std::string>() << "\n";
+    reg->start();
   }
+  context.run();
 }