From 4d98e0f57146db6906bca2c197a3f42bb9e2baf1 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Thu, 14 May 2015 14:48:21 -0400
Subject: [PATCH] ice: use lock_guard than unique_lock
The former has less overhead than later if extra features not needed.
Refs #73286
Change-Id: I2eb988dc546e92c934304a2e9b9419f5a025f23b
---
src/ice_transport.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp
index 098b1f29e1..cc04f17083 100644
--- a/src/ice_transport.cpp
+++ b/src/ice_transport.cpp
@@ -560,7 +560,7 @@ IceTransport::onReceiveData(unsigned comp_id, void *pkt, pj_size_t size)
if (!size)
return;
auto& io = compIO_[comp_id-1];
- std::unique_lock<std::mutex> lk(io.mutex);
+ std::lock_guard<std::mutex> lk(io.mutex);
if (io.cb) {
io.cb((uint8_t*)pkt, size);
} else {
@@ -629,7 +629,7 @@ IceTransport::recv(int comp_id, unsigned char* buf, size_t len)
{
register_thread();
auto& io = compIO_[comp_id];
- std::unique_lock<std::mutex> lk(io.mutex);
+ std::lock_guard<std::mutex> lk(io.mutex);
if (io.queue.empty())
return 0;
@@ -646,7 +646,7 @@ void
IceTransport::setOnRecv(unsigned comp_id, IceRecvCb cb)
{
auto& io = compIO_[comp_id];
- std::unique_lock<std::mutex> lk(io.mutex);
+ std::lock_guard<std::mutex> lk(io.mutex);
io.cb = cb;
if (cb) {
@@ -684,7 +684,7 @@ ssize_t
IceTransport::getNextPacketSize(int comp_id)
{
auto& io = compIO_[comp_id];
- std::unique_lock<std::mutex> lk(io.mutex);
+ std::lock_guard<std::mutex> lk(io.mutex);
if (io.queue.empty()) {
return 0;
}
--
GitLab