From 17fd219bebc7165e6085c3439feb349e7610b528 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Thu, 12 May 2022 15:22:50 -0400
Subject: [PATCH] sessiond: session registry: use pthread::lock_guard instead
 of raw lock
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I3f5227782701a82257b710232fc02bd3c61a2e20
---
 src/bin/lttng-sessiond/ust-registry-session.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/bin/lttng-sessiond/ust-registry-session.cpp b/src/bin/lttng-sessiond/ust-registry-session.cpp
index 2aaed4ef9..20dbc41a5 100644
--- a/src/bin/lttng-sessiond/ust-registry-session.cpp
+++ b/src/bin/lttng-sessiond/ust-registry-session.cpp
@@ -10,6 +10,8 @@
 #include <common/compat/directory-handle.hpp>
 #include <common/error.hpp>
 #include <common/exception.hpp>
+#include <common/macros.hpp>
+#include <common/pthread-lock.hpp>
 #include <common/runas.hpp>
 
 #include <fcntl.h>
@@ -152,9 +154,9 @@ ust_registry_session::~ust_registry_session()
 
 void ust_registry_session::statedump()
 {
-	pthread_mutex_lock(&_lock);
+	lttng::pthread::lock_guard registry_lock(_lock);
+
 	const int ret = ust_metadata_session_statedump(this);
-	pthread_mutex_unlock(&_lock);
 	if (ret) {
 		LTTNG_THROW_ERROR(
 				"Failed to generate session metadata during registry session creation");
-- 
2.34.1