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

Replaced unique_lock with lock_guard where possible

Browse source
This commit is contained in:
eidheim 2019-03-08 12:54:56 +01:00
commit c14705c62b
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server_http.hpp
View file

@ -457,7 +457,7 @@ namespace SimpleWeb {
acceptor->close(ec);
{
std::unique_lock<std::mutex> lock(*connections_mutex);
std::lock_guard<std::mutex> lock(*connections_mutex);
for(auto &connection : *connections)
connection->close();
connections->clear();
@ -495,7 +495,7 @@ namespace SimpleWeb {
auto connections_mutex = this->connections_mutex;
auto connection = std::shared_ptr<Connection>(new Connection(handler_runner, std::forward<Args>(args)...), [connections, connections_mutex](Connection *connection) {
{
std::unique_lock<std::mutex> lock(*connections_mutex);
std::lock_guard<std::mutex> lock(*connections_mutex);
auto it = connections->find(connection);
if(it != connections->end())
connections->erase(it);
@ -503,7 +503,7 @@ namespace SimpleWeb {
delete connection;
});
{
std::unique_lock<std::mutex> lock(*connections_mutex);
std::lock_guard<std::mutex> lock(*connections_mutex);
connections->emplace(connection.get());
}
return connection;
@ -683,7 +683,7 @@ namespace SimpleWeb {
if(it != session->request->header.end()) {
// remove connection from connections
{
std::unique_lock<std::mutex> lock(*connections_mutex);
std::lock_guard<std::mutex> lock(*connections_mutex);
auto it = connections->find(session->connection.get());
if(it != connections->end())
connections->erase(it);