{"id":24104,"url":"https://patchwork.libcamera.org/api/patches/24104/?format=json","web_url":"https://patchwork.libcamera.org/patch/24104/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20250814144313.2114628-1-barnabas.pocze@ideasonboard.com>","date":"2025-08-14T14:43:13","name":"[v1] libcamera: base: thread: Use `std::unique_ptr` instead of raw pointer","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"8cbe1081f00bc3bdbe535b4850faca0a7982f234","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/people/216/?format=json","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/24104/mbox/","series":[{"id":5376,"url":"https://patchwork.libcamera.org/api/series/5376/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5376","date":"2025-08-14T14:43:13","name":"[v1] libcamera: base: thread: Use `std::unique_ptr` instead of raw pointer","version":1,"mbox":"https://patchwork.libcamera.org/series/5376/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/24104/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24104/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 4AB70BEFBE\n\tfor ;\n\tThu, 14 Aug 2025 14:43:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 71CD26925B;\n\tThu, 14 Aug 2025 16:43:17 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 36E9C69247\n\tfor ;\n\tThu, 14 Aug 2025 16:43:16 +0200 (CEST)","from pb-laptop.local (185.221.141.188.nat.pool.zt.hu\n\t[185.221.141.188])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id CE9387E6\n\tfor ;\n\tThu, 14 Aug 2025 16:42:21 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"vPtxeQGz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1755182541;\n\tbh=i4no8/O2H9EszLgC4xM/J0GGLGIQ4Rz0OPOmskJAu90=;\n\th=From:To:Subject:Date:From;\n\tb=vPtxeQGzMIAlTbywdFJDbdZKS3nGIG7Z2oEGugoRSeqzBKDoZUuGpe+dWh/bvjUUn\n\tkXptHHNCqDu/6U0Xi1EHjFc9yiCoI0QdtEAngcTK7kMbcLvc6V2rc2l/QiTZT7EjwS\n\tfBgJa/OvxM5yxxTbrk2w0/VN6aT/NZkJCd17xKJQ=","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v1] libcamera: base: thread: Use `std::unique_ptr` instead of\n\traw pointer","Date":"Thu, 14 Aug 2025 16:43:13 +0200","Message-ID":"<20250814144313.2114628-1-barnabas.pocze@ideasonboard.com>","X-Mailer":"git-send-email 2.50.1","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"An `std::unique_ptr` is safer and expresses the intent better, so use that.\n\nSigned-off-by: Barnabás Pőcze \n---\nOr the same can be achieved by porting `Thread` to inherit `Extensible`.\n---\n include/libcamera/base/thread.h | 2 +-\n src/libcamera/base/thread.cpp | 18 ++++++++----------\n 2 files changed, 9 insertions(+), 11 deletions(-)\n\n--\n2.50.1","diff":"diff --git a/include/libcamera/base/thread.h b/include/libcamera/base/thread.h\nindex b9284c2c0..719d7eedb 100644\n--- a/include/libcamera/base/thread.h\n+++ b/include/libcamera/base/thread.h\n@@ -75,7 +75,7 @@ private:\n \t\t\tThreadData *targetData);\n\n \tstd::thread thread_;\n-\tThreadData *data_;\n+\tstd::unique_ptr data_;\n };\n\n } /* namespace libcamera */\ndiff --git a/src/libcamera/base/thread.cpp b/src/libcamera/base/thread.cpp\nindex d8fe0d697..92a7a8f7d 100644\n--- a/src/libcamera/base/thread.cpp\n+++ b/src/libcamera/base/thread.cpp\n@@ -105,8 +105,8 @@ public:\n class ThreadData\n {\n public:\n-\tThreadData()\n-\t\t: thread_(nullptr), running_(false), dispatcher_(nullptr)\n+\tThreadData(Thread *thread)\n+\t\t: thread_(thread), running_(false), dispatcher_(nullptr)\n \t{\n \t}\n\n@@ -167,7 +167,7 @@ ThreadData *ThreadData::current()\n \t * The main thread doesn't receive thread-local data when it is\n \t * started, set it here.\n \t */\n-\tThreadData *data = mainThread.data_;\n+\tThreadData *data = mainThread.data_.get();\n \tdata->tid_ = syscall(SYS_gettid);\n \tcurrentThreadData = data;\n \treturn data;\n@@ -231,15 +231,13 @@ ThreadData *ThreadData::current()\n * \\brief Create a thread\n */\n Thread::Thread()\n+\t: data_(std::make_unique(this))\n {\n-\tdata_ = new ThreadData;\n-\tdata_->thread_ = this;\n }\n\n Thread::~Thread()\n {\n \tdelete data_->dispatcher_.load(std::memory_order_relaxed);\n-\tdelete data_;\n }\n\n /**\n@@ -284,7 +282,7 @@ void Thread::startThread()\n \tthread_local ThreadCleaner cleaner(this, &Thread::finishThread);\n\n \tdata_->tid_ = syscall(SYS_gettid);\n-\tcurrentThreadData = data_;\n+\tcurrentThreadData = data_.get();\n\n \trun();\n }\n@@ -621,7 +619,7 @@ void Thread::removeMessages(Object *receiver)\n */\n void Thread::dispatchMessages(Message::Type type, Object *receiver)\n {\n-\tASSERT(data_ == ThreadData::current());\n+\tASSERT(data_.get() == ThreadData::current());\n\n \t++data_->messages_.recursion_;\n\n@@ -677,8 +675,8 @@ void Thread::dispatchMessages(Message::Type type, Object *receiver)\n */\n void Thread::moveObject(Object *object)\n {\n-\tThreadData *currentData = object->thread_->data_;\n-\tThreadData *targetData = data_;\n+\tThreadData *currentData = object->thread_->data_.get();\n+\tThreadData *targetData = data_.get();\n\n \tMutexLocker lockerFrom(currentData->messages_.mutex_, std::defer_lock);\n \tMutexLocker lockerTo(targetData->messages_.mutex_, std::defer_lock);\n","prefixes":["v1"]}