mirrors/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib.git synced 2025-05-10 09:43:51 +00:00
Code Issues Projects Releases Wiki Activity

Temporary solution for #52

Browse Source
This commit is contained in:
yhirose 2018-04-16 22:12:45 -04:00
parent 66550eb71b
commit 3c711089e5
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
httplib.h
View File

@ -52,6 +52,7 @@ typedef int socket_t;
#include <functional> #include <functional>
#include <map> #include <map>
#include <memory> #include <memory>
#include <mutex>
#include <regex> #include <regex>
#include <string> #include <string>
#include <thread> #include <thread>
@ -231,6 +232,10 @@ private:
Handlers post_handlers_; Handlers post_handlers_;
Handler error_handler_; Handler error_handler_;
Logger logger_; Logger logger_;
// TODO: Use thread pool...
std::mutex running_threads_mutex_;
int running_threads_;
}; };
class Client { class Client {
@ -1407,6 +1412,7 @@ inline std::string SocketStream::get_remote_addr() {
inline Server::Server(HttpVersion http_version) inline Server::Server(HttpVersion http_version)
: http_version_(http_version) : http_version_(http_version)
, svr_sock_(-1) , svr_sock_(-1)
, running_threads_(0)
{ {
#ifndef _WIN32 #ifndef _WIN32
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
@ -1632,10 +1638,29 @@ inline bool Server::listen_internal()
// TODO: Use thread pool... // TODO: Use thread pool...
std::thread([=]() { std::thread([=]() {
{
std::lock_guard<std::mutex> guard(running_threads_mutex_);
running_threads_++;
}
read_and_close_socket(sock); read_and_close_socket(sock);
{
std::lock_guard<std::mutex> guard(running_threads_mutex_);
running_threads_--;
}
}).detach(); }).detach();
} }
// TODO: Use thread pool...
for (;;) {
std::this_thread::sleep_for(std::chrono::milliseconds(10));
std::lock_guard<std::mutex> guard(running_threads_mutex_);
if (!running_threads_) {
break;
}
}
return ret; return ret;
} }