From 76f923d7bdfe8992438590ff89cf78f47dfa9e5d Mon Sep 17 00:00:00 2001 From: eidheim Date: Fri, 7 Jul 2017 22:38:44 +0200 Subject: [PATCH] Reverted stop changes due to complications when running on one core --- server_http.hpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/server_http.hpp b/server_http.hpp index 5d52336..fd43736 100644 --- a/server_http.hpp +++ b/server_http.hpp @@ -362,6 +362,9 @@ namespace SimpleWeb { internal_io_service = true; } + if(io_service->stopped()) + io_service->reset(); + asio::ip::tcp::endpoint endpoint; if(config.address.size() > 0) endpoint = asio::ip::tcp::endpoint(asio::ip::address::from_string(config.address), config.port); @@ -400,12 +403,8 @@ namespace SimpleWeb { void stop() { if(acceptor) { acceptor->close(); - if(internal_io_service) { + if(internal_io_service) io_service->stop(); - while(!io_service->stopped()) - std::this_thread::yield(); - io_service->reset(); - } } }