Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/marian-nmt/Simple-WebSocket-Server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreidheim <eidheim@gmail.com>2019-03-08 14:55:34 +0300
committereidheim <eidheim@gmail.com>2019-03-08 14:55:34 +0300
commit36d1a9d3d8bf3ed98652f32bd531d5273dfc029b (patch)
tree35e97e4810594f25aea6d85963a43ac61c4137b8
parentea84dd17aa92d52269eaccd03085891ef3a2766c (diff)
Replaced unique_lock with lock_guard where possible
-rw-r--r--client_ws.hpp6
-rw-r--r--server_ws.hpp16
2 files changed, 11 insertions, 11 deletions
diff --git a/client_ws.hpp b/client_ws.hpp
index 9b100dd..cfd0fd3 100644
--- a/client_ws.hpp
+++ b/client_ws.hpp
@@ -136,7 +136,7 @@ namespace SimpleWeb {
seconds = timeout_idle;
}
- std::unique_lock<std::mutex> lock(timer_mutex);
+ std::lock_guard<std::mutex> lock(timer_mutex);
if(seconds == 0) {
timer = nullptr;
@@ -159,7 +159,7 @@ namespace SimpleWeb {
}
void cancel_timeout() noexcept {
- std::unique_lock<std::mutex> lock(timer_mutex);
+ std::lock_guard<std::mutex> lock(timer_mutex);
if(timer) {
error_code ec;
timer->cancel(ec);
@@ -339,7 +339,7 @@ namespace SimpleWeb {
void stop() noexcept {
{
- std::unique_lock<std::mutex> lock(connection_mutex);
+ std::lock_guard<std::mutex> lock(connection_mutex);
if(connection)
connection->close();
}
diff --git a/server_ws.hpp b/server_ws.hpp
index 8d8712a..9a45cf5 100644
--- a/server_ws.hpp
+++ b/server_ws.hpp
@@ -156,7 +156,7 @@ namespace SimpleWeb {
seconds = timeout_idle;
}
- std::unique_lock<std::mutex> lock(timer_mutex);
+ std::lock_guard<std::mutex> lock(timer_mutex);
if(seconds == 0) {
timer = nullptr;
@@ -179,7 +179,7 @@ namespace SimpleWeb {
}
void cancel_timeout() noexcept {
- std::unique_lock<std::mutex> lock(timer_mutex);
+ std::lock_guard<std::mutex> lock(timer_mutex);
if(timer) {
error_code ec;
timer->cancel(ec);
@@ -334,7 +334,7 @@ namespace SimpleWeb {
std::function<void(std::shared_ptr<Connection>)> on_pong;
std::unordered_set<std::shared_ptr<Connection>> get_connections() noexcept {
- std::unique_lock<std::mutex> lock(connections_mutex);
+ std::lock_guard<std::mutex> lock(connections_mutex);
auto copy = connections;
return copy;
}
@@ -454,7 +454,7 @@ namespace SimpleWeb {
acceptor->close(ec);
for(auto &pair : endpoint) {
- std::unique_lock<std::mutex> lock(pair.second.connections_mutex);
+ std::lock_guard<std::mutex> lock(pair.second.connections_mutex);
for(auto &connection : pair.second.connections)
connection->close();
pair.second.connections.clear();
@@ -478,7 +478,7 @@ namespace SimpleWeb {
std::unordered_set<std::shared_ptr<Connection>> get_connections() noexcept {
std::unordered_set<std::shared_ptr<Connection>> all_connections;
for(auto &e : endpoint) {
- std::unique_lock<std::mutex> lock(e.second.connections_mutex);
+ std::lock_guard<std::mutex> lock(e.second.connections_mutex);
all_connections.insert(e.second.connections.begin(), e.second.connections.end());
}
return all_connections;
@@ -790,7 +790,7 @@ namespace SimpleWeb {
connection->set_timeout();
{
- std::unique_lock<std::mutex> lock(endpoint.connections_mutex);
+ std::lock_guard<std::mutex> lock(endpoint.connections_mutex);
endpoint.connections.insert(connection);
}
@@ -803,7 +803,7 @@ namespace SimpleWeb {
connection->set_timeout();
{
- std::unique_lock<std::mutex> lock(endpoint.connections_mutex);
+ std::lock_guard<std::mutex> lock(endpoint.connections_mutex);
endpoint.connections.erase(connection);
}
@@ -816,7 +816,7 @@ namespace SimpleWeb {
connection->set_timeout();
{
- std::unique_lock<std::mutex> lock(endpoint.connections_mutex);
+ std::lock_guard<std::mutex> lock(endpoint.connections_mutex);
endpoint.connections.erase(connection);
}