boost/asio
2
0
Fork 0
mirror of https://github.com/boostorg/asio.git synced 2026-02-02 20:32:08 +00:00
Code Issues Projects Releases Wiki Activity

Initial merge of Networking TS compatibility.

Browse Source 
Merged from chriskohlhoff/asio master branch as of commit
4a4d28b0d24c53236e229bd1b5f378c9964b1ebb.
This commit is contained in:
Christopher Kohlhoff
2017-10-23 14:27:36 +11:00
parent b002097359
commit b60e92b13e
617 changed files with 43380 additions and 21694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
example/cpp03/http/server/server.cpp
View File

@@ -17,9 +17,9 @@ namespace server {
server::server(const std::string& address, const std::string& port,
const std::string& doc_root)
: io_service_(),
signals_(io_service_),
acceptor_(io_service_),
: io_context_(),
signals_(io_context_),
acceptor_(io_context_),
connection_manager_(),
new_connection_(),
request_handler_(doc_root)
@@ -35,9 +35,9 @@ server::server(const std::string& address, const std::string& port,
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);
boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
boost::asio::ip::tcp::resolver resolver(io_context_);
boost::asio::ip::tcp::endpoint endpoint =
*resolver.resolve(address, port).begin();
acceptor_.open(endpoint.protocol());
acceptor_.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
acceptor_.bind(endpoint);
@@ -48,16 +48,16 @@ server::server(const std::string& address, const std::string& port,
void server::run()
{
// The io_service::run() call will block until all asynchronous operations
// The io_context::run() call will block until all asynchronous operations
// have finished. While the server is running, there is always at least one
// asynchronous operation outstanding: the asynchronous accept call waiting
// for new incoming connections.
io_service_.run();
io_context_.run();
}
void server::start_accept()
{
new_connection_.reset(new connection(io_service_,
new_connection_.reset(new connection(io_context_,
connection_manager_, request_handler_));
acceptor_.async_accept(new_connection_->socket(),
boost::bind(&server::handle_accept, this,
@@ -84,7 +84,7 @@ void server::handle_accept(const boost::system::error_code& e)
void server::handle_stop()
{
// The server is stopped by cancelling all outstanding asynchronous
// operations. Once all operations have finished the io_service::run() call
// operations. Once all operations have finished the io_context::run() call
// will exit.
acceptor_.close();
connection_manager_.stop_all();