jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reverted stop changes due to complications when running on one core

Browse source
This commit is contained in:
eidheim 2017-07-07 22:38:44 +02:00
commit 76f923d7bd
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
server_http.hpp
View file

@ -362,6 +362,9 @@ namespace SimpleWeb {
internal_io_service = true; internal_io_service = true;
} }
if(io_service->stopped())
io_service->reset();
asio::ip::tcp::endpoint endpoint; asio::ip::tcp::endpoint endpoint;
if(config.address.size() > 0) if(config.address.size() > 0)
endpoint = asio::ip::tcp::endpoint(asio::ip::address::from_string(config.address), config.port); endpoint = asio::ip::tcp::endpoint(asio::ip::address::from_string(config.address), config.port);
@ -400,12 +403,8 @@ namespace SimpleWeb {
void stop() { void stop() {
if(acceptor) { if(acceptor) {
acceptor->close(); acceptor->close();
if(internal_io_service) { if(internal_io_service)
io_service->stop(); io_service->stop();
while(!io_service->stopped())
std::this_thread::yield();
io_service->reset();
}
} }
} }