{"id":19455,"url":"https://patchwork.libcamera.org/api/patches/19455/?format=json","web_url":"https://patchwork.libcamera.org/patch/19455/","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":"<20240123011249.22716-8-laurent.pinchart@ideasonboard.com>","date":"2024-01-23T01:12:44","name":"[v2,07/12] test: message: Destroy Object from correct thread context","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"601fb7aa285a59c28712b3cc91aa9c5a09e62a95","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19455/mbox/","series":[{"id":4157,"url":"https://patchwork.libcamera.org/api/series/4157/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4157","date":"2024-01-23T01:12:37","name":"libcamera: Hardening against thread race conditions","version":2,"mbox":"https://patchwork.libcamera.org/series/4157/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19455/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19455/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 4EFCBC32C1\n\tfor ;\n\tTue, 23 Jan 2024 01:12:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 416346297C;\n\tTue, 23 Jan 2024 02:12:59 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8D8836295B\n\tfor ;\n\tTue, 23 Jan 2024 02:12:55 +0100 (CET)","from pendragon.ideasonboard.com (89-27-53-110.bb.dnainternet.fi\n\t[89.27.53.110])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 39AB31BB1;\n\tTue, 23 Jan 2024 02:11:42 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"CIS2lh7+\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1705972302;\n\tbh=z5mE57OfFaXiiOtYjcBi8iI7wh84D6GwTqAyVRToKmE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=CIS2lh7+eNt57TTDUyt5PJAcrsDx8pp/u7dzc+pUZD8Y1Y5RUFxf4PA2aR/rBqe4h\n\tD/I4Lu3Q5bjsNc0hfBQ1AXBb/4mHFSraCWz3Rgs56fWk2DyuL/oSYzXGabN/LfiPBY\n\tfUHxnzDHNXFZCXykmz1FkPp+4J9WROpeDnGkfBeE=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v2 07/12] test: message: Destroy Object from correct thread\n\tcontext","Date":"Tue, 23 Jan 2024 03:12:44 +0200","Message-ID":"<20240123011249.22716-8-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20240123011249.22716-1-laurent.pinchart@ideasonboard.com>","References":"<20240123011249.22716-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","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":"The MessageReceiver and RecursiveMessageReceiver used in the test are\ndestroyed from the main thread, which is invalid for a thread-bound\nobject bound to a different thread. Fix it by destroying them with\ndeleteLater().\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Milan Zamazal \n---\n test/message.cpp | 19 ++++++++++++-------\n 1 file changed, 12 insertions(+), 7 deletions(-)","diff":"diff --git a/test/message.cpp b/test/message.cpp\nindex a34e0f0b5e10..2f9f281c5101 100644\n--- a/test/message.cpp\n+++ b/test/message.cpp\n@@ -109,16 +109,19 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tMessageReceiver receiver;\n-\t\treceiver.moveToThread(&thread_);\n+\t\tMessageReceiver *receiver = new MessageReceiver();\n+\t\treceiver->moveToThread(&thread_);\n \n \t\tthread_.start();\n \n-\t\treceiver.postMessage(std::make_unique(Message::None));\n+\t\treceiver->postMessage(std::make_unique(Message::None));\n \n \t\tthis_thread::sleep_for(chrono::milliseconds(100));\n \n-\t\tswitch (receiver.status()) {\n+\t\tMessageReceiver::Status status = receiver->status();\n+\t\treceiver->deleteLater();\n+\n+\t\tswitch (status) {\n \t\tcase MessageReceiver::NoMessage:\n \t\t\tcout << \"No message received\" << endl;\n \t\t\treturn TestFail;\n@@ -135,8 +138,7 @@ protected:\n \t\t * leaks. Two messages need to be posted to ensure we don't only\n \t\t * test the simple case of a queue containing a single message.\n \t\t */\n-\t\tstd::unique_ptr recursiveReceiver =\n-\t\t\tstd::make_unique();\n+\t\tRecursiveMessageReceiver *recursiveReceiver = new RecursiveMessageReceiver();\n \t\trecursiveReceiver->moveToThread(&thread_);\n \n \t\trecursiveReceiver->postMessage(std::make_unique(Message::None));\n@@ -144,7 +146,10 @@ protected:\n \n \t\tthis_thread::sleep_for(chrono::milliseconds(10));\n \n-\t\tif (!recursiveReceiver->success()) {\n+\t\tbool success = recursiveReceiver->success();\n+\t\trecursiveReceiver->deleteLater();\n+\n+\t\tif (!success) {\n \t\t\tcout << \"Recursive message delivery failed\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n","prefixes":["v2","07/12"]}