[Boost-commit] svn:boost r71707 - in trunk/libs/asio/example/http: server server2 server3

Subject: [Boost-commit] svn:boost r71707 - in trunk/libs/asio/example/http: server server2 server3
From: chris_at_[hidden]
Date: 2011-05-03 19:57:24

Author: chris_kohlhoff
Date: 2011-05-03 19:57:23 EDT (Tue, 03 May 2011)
New Revision: 71707
URL: http://svn.boost.org/trac/boost/changeset/71707

Log:
Use new signal_set to shut down.
Text files modified: 
   trunk/libs/asio/example/http/server/server.cpp  |     7 -------                                 
   trunk/libs/asio/example/http/server/server.hpp  |     3 ---                                     
   trunk/libs/asio/example/http/server2/main.cpp   |     8 ++++----                                
   trunk/libs/asio/example/http/server2/server.cpp |    21 ++++++++++++++++-----                   
   trunk/libs/asio/example/http/server2/server.hpp |     9 ++++++---                               
   trunk/libs/asio/example/http/server3/main.cpp   |     8 ++++----                                
   trunk/libs/asio/example/http/server3/server.cpp |    21 ++++++++++++++++-----                   
   trunk/libs/asio/example/http/server3/server.hpp |     9 ++++++---                               
   8 files changed, 52 insertions(+), 34 deletions(-)

Modified: trunk/libs/asio/example/http/server/server.cpp
==============================================================================
--- trunk/libs/asio/example/http/server/server.cpp	(original)
+++ trunk/libs/asio/example/http/server/server.cpp	2011-05-03 19:57:23 EDT (Tue, 03 May 2011)
@@ -57,13 +57,6 @@
   io_service_.run();
 }
 
-void server::stop()
-{
-  // Post a call to the stop function so that server::stop() is safe to call
-  // from any thread.
-  io_service_.post(boost::bind(&server::handle_stop, this));
-}
-
 void server::handle_accept(const boost::system::error_code& e)
 {
   if (!e)

Modified: trunk/libs/asio/example/http/server/server.hpp
==============================================================================
--- trunk/libs/asio/example/http/server/server.hpp	(original)
+++ trunk/libs/asio/example/http/server/server.hpp	2011-05-03 19:57:23 EDT (Tue, 03 May 2011)
@@ -34,9 +34,6 @@
   /// Run the server's io_service loop.
   void run();
 
-  /// Stop the server.
-  void stop();
-
 private:
   /// Handle completion of an asynchronous accept operation.
   void handle_accept(const boost::system::error_code& e);

Modified: trunk/libs/asio/example/http/server2/main.cpp
==============================================================================
--- trunk/libs/asio/example/http/server2/main.cpp	(original)
+++ trunk/libs/asio/example/http/server2/main.cpp	2011-05-03 19:57:23 EDT (Tue, 03 May 2011)
@@ -20,13 +20,13 @@
   try
   {
     // Check command line arguments.
-    if (argc != 4)
+    if (argc != 5)
     {
-      std::cerr << "Usage: http_server <address> <port> <doc_root>\n";
+      std::cerr << "Usage: http_server <address> <port> <threads> <doc_root>\n";
       std::cerr << "  For IPv4, try:\n";
-      std::cerr << "    receiver 0.0.0.0 80 .\n";
+      std::cerr << "    receiver 0.0.0.0 80 1 .\n";
       std::cerr << "  For IPv6, try:\n";
-      std::cerr << "    receiver 0::0 80 .\n";
+      std::cerr << "    receiver 0::0 80 1 .\n";
       return 1;
     }
 

Modified: trunk/libs/asio/example/http/server2/server.cpp
==============================================================================
--- trunk/libs/asio/example/http/server2/server.cpp	(original)
+++ trunk/libs/asio/example/http/server2/server.cpp	2011-05-03 19:57:23 EDT (Tue, 03 May 2011)
@@ -17,11 +17,22 @@
 server::server(const std::string& address, const std::string& port,
     const std::string& doc_root, std::size_t io_service_pool_size)
   : io_service_pool_(io_service_pool_size),
+    signals_(io_service_pool_.get_io_service()),
     acceptor_(io_service_pool_.get_io_service()),
     new_connection_(new connection(
           io_service_pool_.get_io_service(), request_handler_)),
     request_handler_(doc_root)
 {
+  // Register to handle the signals that indicate when the server should exit.
+  // It is safe to register for the same signal multiple times in a program,
+  // provided all registration for the specified signal is made through Asio.
+  signals_.add(SIGINT);
+  signals_.add(SIGTERM);
+#if defined(SIGQUIT)
+  signals_.add(SIGQUIT);
+#endif // defined(SIGQUIT)
+  signals_.async_wait(boost::bind(&server::handle_stop, this));
+
   // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
   boost::asio::ip::tcp::resolver resolver(acceptor_.get_io_service());
   boost::asio::ip::tcp::resolver::query query(address, port);
@@ -40,11 +51,6 @@
   io_service_pool_.run();
 }
 
-void server::stop()
-{
-  io_service_pool_.stop();
-}
-
 void server::handle_accept(const boost::system::error_code& e)
 {
   if (!e)
@@ -58,5 +64,10 @@
   }
 }
 
+void server::handle_stop()
+{
+  io_service_pool_.stop();
+}
+
 } // namespace server2
 } // namespace http

Modified: trunk/libs/asio/example/http/server2/server.hpp
==============================================================================
--- trunk/libs/asio/example/http/server2/server.hpp	(original)
+++ trunk/libs/asio/example/http/server2/server.hpp	2011-05-03 19:57:23 EDT (Tue, 03 May 2011)
@@ -36,16 +36,19 @@
   /// Run the server's io_service loop.
   void run();
 
-  /// Stop the server.
-  void stop();
-
 private:
   /// Handle completion of an asynchronous accept operation.
   void handle_accept(const boost::system::error_code& e);
 
+  /// Handle a request to stop the server.
+  void handle_stop();
+
   /// The pool of io_service objects used to perform asynchronous operations.
   io_service_pool io_service_pool_;
 
+  /// The signal_set is used to register for process termination notifications.
+  boost::asio::signal_set signals_;
+
   /// Acceptor used to listen for incoming connections.
   boost::asio::ip::tcp::acceptor acceptor_;
 

Modified: trunk/libs/asio/example/http/server3/main.cpp
==============================================================================
--- trunk/libs/asio/example/http/server3/main.cpp	(original)
+++ trunk/libs/asio/example/http/server3/main.cpp	2011-05-03 19:57:23 EDT (Tue, 03 May 2011)
@@ -20,13 +20,13 @@
   try
   {
     // Check command line arguments.
-    if (argc != 4)
+    if (argc != 5)
     {
-      std::cerr << "Usage: http_server <address> <port> <doc_root>\n";
+      std::cerr << "Usage: http_server <address> <port> <threads> <doc_root>\n";
       std::cerr << "  For IPv4, try:\n";
-      std::cerr << "    receiver 0.0.0.0 80 .\n";
+      std::cerr << "    receiver 0.0.0.0 80 1 .\n";
       std::cerr << "  For IPv6, try:\n";
-      std::cerr << "    receiver 0::0 80 .\n";
+      std::cerr << "    receiver 0::0 80 1 .\n";
       return 1;
     }
 

Modified: trunk/libs/asio/example/http/server3/server.cpp
==============================================================================
--- trunk/libs/asio/example/http/server3/server.cpp	(original)
+++ trunk/libs/asio/example/http/server3/server.cpp	2011-05-03 19:57:23 EDT (Tue, 03 May 2011)
@@ -20,10 +20,21 @@
 server::server(const std::string& address, const std::string& port,
     const std::string& doc_root, std::size_t thread_pool_size)
   : thread_pool_size_(thread_pool_size),
+    signals_(io_service_),
     acceptor_(io_service_),
     new_connection_(new connection(io_service_, request_handler_)),
     request_handler_(doc_root)
 {
+  // Register to handle the signals that indicate when the server should exit.
+  // It is safe to register for the same signal multiple times in a program,
+  // provided all registration for the specified signal is made through Asio.
+  signals_.add(SIGINT);
+  signals_.add(SIGTERM);
+#if defined(SIGQUIT)
+  signals_.add(SIGQUIT);
+#endif // defined(SIGQUIT)
+  signals_.async_wait(boost::bind(&server::handle_stop, this));
+
   // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
   boost::asio::ip::tcp::resolver resolver(io_service_);
   boost::asio::ip::tcp::resolver::query query(address, port);
@@ -53,11 +64,6 @@
     threads[i]->join();
 }
 
-void server::stop()
-{
-  io_service_.stop();
-}
-
 void server::handle_accept(const boost::system::error_code& e)
 {
   if (!e)
@@ -70,5 +76,10 @@
   }
 }
 
+void server::handle_stop()
+{
+  io_service_.stop();
+}
+
 } // namespace server3
 } // namespace http

Modified: trunk/libs/asio/example/http/server3/server.hpp
==============================================================================
--- trunk/libs/asio/example/http/server3/server.hpp	(original)
+++ trunk/libs/asio/example/http/server3/server.hpp	2011-05-03 19:57:23 EDT (Tue, 03 May 2011)
@@ -35,19 +35,22 @@
   /// Run the server's io_service loop.
   void run();
 
-  /// Stop the server.
-  void stop();
-
 private:
   /// Handle completion of an asynchronous accept operation.
   void handle_accept(const boost::system::error_code& e);
 
+  /// Handle a request to stop the server.
+  void handle_stop();
+
   /// The number of threads that will call io_service::run().
   std::size_t thread_pool_size_;
 
   /// The io_service used to perform asynchronous operations.
   boost::asio::io_service io_service_;
 
+  /// The signal_set is used to register for process termination notifications.
+  boost::asio::signal_set signals_;
+
   /// Acceptor used to listen for incoming connections.
   boost::asio::ip::tcp::acceptor acceptor_;