[{"id":35416,"web_url":"https://patchwork.libcamera.org/comment/35416/","msgid":"<20250814215447.GA6201@pendragon.ideasonboard.com>","date":"2025-08-14T21:54:47","subject":"Re: [PATCH v1] libcamera: base: thread: Use `std::unique_ptr`\n\tinstead of raw pointer","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Thu, Aug 14, 2025 at 04:43:13PM +0200, Barnabás Pőcze wrote:\n> An `std::unique_ptr` is safer and expresses the intent better, so use that.\n> \n> Signed-off-by: Barnabás Pőcze \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> Or the same can be achieved by porting `Thread` to inherit `Extensible`.\n\nOr we could possibly merge the Thread and ThreadData classes. I haven't\nchecked if there's a need to keep them separate.\n\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> diff --git a/include/libcamera/base/thread.h b/include/libcamera/base/thread.h\n> index 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 */\n> diff --git a/src/libcamera/base/thread.cpp b/src/libcamera/base/thread.cpp\n> index 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);","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 39A49BDCC1\n\tfor ;\n\tThu, 14 Aug 2025 21:55:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3D9CA69254;\n\tThu, 14 Aug 2025 23:55:09 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B17A961444\n\tfor ;\n\tThu, 14 Aug 2025 23:55:07 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id D06FFE9B;\n\tThu, 14 Aug 2025 23:54:12 +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=\"Y6aHXJiQ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1755208453;\n\tbh=2FxyR7NA3vEF/jYvkZ9tO9jl8DtVYPtcj9vdbmciFzc=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Y6aHXJiQHrJ9y+Hwo05oHNjAAwznX/3gH01mZnkWgvi/akwqCRIVbBOklcKz3kNEd\n\tc15XaiyJn1XIDNN9HcZeoRlBt7GjfxQHwVfnPhKX63OfLhjx+jM+GZwmGQG6JcMS++\n\tsujvJ9uDnUQVKPymFzhkVVH6a5LKIgdhXKtzD+iA=","Date":"Fri, 15 Aug 2025 00:54:47 +0300","From":"Laurent Pinchart ","To":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v1] libcamera: base: thread: Use `std::unique_ptr`\n\tinstead of raw pointer","Message-ID":"<20250814215447.GA6201@pendragon.ideasonboard.com>","References":"<20250814144313.2114628-1-barnabas.pocze@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20250814144313.2114628-1-barnabas.pocze@ideasonboard.com>","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\" "}},{"id":36592,"web_url":"https://patchwork.libcamera.org/comment/36592/","msgid":"","date":"2025-11-01T16:32:59","subject":"Re: [PATCH v1] libcamera: base: thread: Use `std::unique_ptr`\n\tinstead of raw pointer","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"content":"Hi Barnabás\n\nOn Thu, Aug 14, 2025 at 04:43:13PM +0200, Barnabás Pőcze wrote:\n> An `std::unique_ptr` is safer and expresses the intent better, so use that.\n>\n> Signed-off-by: Barnabás Pőcze \n> ---\n> Or the same can be achieved by porting `Thread` to inherit `Extensible`.\n\nThis is already better than the existing, so go for it\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\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> diff --git a/include/libcamera/base/thread.h b/include/libcamera/base/thread.h\n> index 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 */\n> diff --git a/src/libcamera/base/thread.cpp b/src/libcamera/base/thread.cpp\n> index 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> --\n> 2.50.1","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 E73F7BDE4C\n\tfor ;\n\tSat, 1 Nov 2025 16:33:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 498AF6086F;\n\tSat, 1 Nov 2025 17:33:05 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7A75F606D5\n\tfor ;\n\tSat, 1 Nov 2025 17:33:03 +0100 (CET)","from ideasonboard.com (unknown\n\t[IPv6:2001:b07:6462:5de2:153:f9b8:5024:faa2])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E003ABB;\n\tSat, 1 Nov 2025 17:31:11 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"mDozAQUV\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1762014672;\n\tbh=WJDVP4Zy7KBFoRVGgMEYG5M7rBDef0dBsVlfmDh/xYI=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=mDozAQUVpet1t1xpuyiuXSR59VEKEmSP6QQJinyO/ayPxBpQd/zTqunHZBmciMkPx\n\tZZSNU0EryEj8UTSfmg8j86xVz51gqtidsmuPdPHlEzME/ow7cVurQUDLIaOL/iKzYF\n\tp00SDYHtdtRWmb9YhskSwgXbo7CBq8gj5w7d1gmc=","Date":"Sat, 1 Nov 2025 17:32:59 +0100","From":"Jacopo Mondi ","To":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v1] libcamera: base: thread: Use `std::unique_ptr`\n\tinstead of raw pointer","Message-ID":"","References":"<20250814144313.2114628-1-barnabas.pocze@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20250814144313.2114628-1-barnabas.pocze@ideasonboard.com>","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\" "}}]