From patchwork Sun Jan 21 03:59:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 19428 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id E24C3C323E for ; Sun, 21 Jan 2024 03:59:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8486C6294F; Sun, 21 Jan 2024 04:59:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1705809598; bh=KC/mNBwsTvo7jbNoWkM9MEDV6p6gdf3XmassPtSI1BY=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=20HNywIfbZGB/d7nREhT/oNCkqMVORoaK2SyTeczMzQ43pDbpqdGSm1nQbNfdV7F/ +YkT+jMVeLEVustz42KtkLQ8dXlNOf+uDrSOr4/2c0tBrcuaDkfQpA3XdgK/aDmmu+ FQacjdJL+HW++Bbwj+8JL0V1LGhcVQDlgPSgW4YJOAtclZSGwDwJn0D00QPcoCSUse YzMYy1srmq7aatdEmAI/1Q4X63Y8IOI2Gx1daUQRlz2j9T7zMBbd9PWNJPVDfWGmwI YqHeDr3w9KRq4PTA4ozDXa6Y+bDjLF47DT3PTkohY731WbieOnIGSN9zwY3TSneS8d AngThxzlvwGMQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3FE0962931 for ; Sun, 21 Jan 2024 04:59:55 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="SKgxIdYP"; dkim-atps=neutral Received: from pendragon.ideasonboard.com (89-27-53-110.bb.dnainternet.fi [89.27.53.110]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3F4521574; Sun, 21 Jan 2024 04:58:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1705809523; bh=KC/mNBwsTvo7jbNoWkM9MEDV6p6gdf3XmassPtSI1BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SKgxIdYPo4SZDENA8F2UWmFt+5tji5rFzSQTSKx7oTcg3Kh1eAW1dltFZ+wpKmaij vfIxcZ16uyy5n4gbDjsOSmoRLTumj9d9MOpUU3iTnRGbX81Otqz+6ZE4o/qpXdjB5+ rOGp0Zr2VMxR4skQrZb82hZjoL35oIfc/t+crsK8= To: libcamera-devel@lists.libcamera.org Date: Sun, 21 Jan 2024 05:59:43 +0200 Message-ID: <20240121035948.4226-8-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240121035948.4226-1-laurent.pinchart@ideasonboard.com> References: <20240121035948.4226-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 07/12] test: message: Destroy Object from correct thread context X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The MessageReceiver and RecursiveMessageReceiver used in the test are destroyed from the main thread, which is invalid for a thread-bound object bound to a different thread. Fix it by destroying them with deleteLater(). Signed-off-by: Laurent Pinchart Reviewed-by: Milan Zamazal --- test/message.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/test/message.cpp b/test/message.cpp index a34e0f0b5e10..2f9f281c5101 100644 --- a/test/message.cpp +++ b/test/message.cpp @@ -109,16 +109,19 @@ protected: return TestFail; } - MessageReceiver receiver; - receiver.moveToThread(&thread_); + MessageReceiver *receiver = new MessageReceiver(); + receiver->moveToThread(&thread_); thread_.start(); - receiver.postMessage(std::make_unique(Message::None)); + receiver->postMessage(std::make_unique(Message::None)); this_thread::sleep_for(chrono::milliseconds(100)); - switch (receiver.status()) { + MessageReceiver::Status status = receiver->status(); + receiver->deleteLater(); + + switch (status) { case MessageReceiver::NoMessage: cout << "No message received" << endl; return TestFail; @@ -135,8 +138,7 @@ protected: * leaks. Two messages need to be posted to ensure we don't only * test the simple case of a queue containing a single message. */ - std::unique_ptr recursiveReceiver = - std::make_unique(); + RecursiveMessageReceiver *recursiveReceiver = new RecursiveMessageReceiver(); recursiveReceiver->moveToThread(&thread_); recursiveReceiver->postMessage(std::make_unique(Message::None)); @@ -144,7 +146,10 @@ protected: this_thread::sleep_for(chrono::milliseconds(10)); - if (!recursiveReceiver->success()) { + bool success = recursiveReceiver->success(); + recursiveReceiver->deleteLater(); + + if (!success) { cout << "Recursive message delivery failed" << endl; return TestFail; }