{"id":19453,"url":"https://patchwork.libcamera.org/api/patches/19453/?format=json","web_url":"https://patchwork.libcamera.org/patch/19453/","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-6-laurent.pinchart@ideasonboard.com>","date":"2024-01-23T01:12:42","name":"[v2,05/12] test: event-thread: Destroy Object from correct thread context","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"516cb0899b024a3249cfdd6ebb0e44596e6d6b1b","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/19453/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/19453/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19453/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 8B33CC32BF\n\tfor ;\n\tTue, 23 Jan 2024 01:12:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AEC796295B;\n\tTue, 23 Jan 2024 02:12:56 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C254962956\n\tfor ;\n\tTue, 23 Jan 2024 02:12:52 +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 6A2271574;\n\tTue, 23 Jan 2024 02:11:39 +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=\"ciuIJC/V\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1705972299;\n\tbh=IVMacLkoa85MRjROikzLeyC8lLdihWPwnn4z5mYbekQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ciuIJC/VyZFOW4lq8NG57XtDjCom+BMnBo7lwTonzUaaTjVXW+JBifKxYW6mHCnCh\n\t1/hTtEQ5u0Xp8WTH0MNNzT/kaBeL+zN90sBlHOtkeXZyraMZAjVNK+wu/8ezGzV6cU\n\twSht3CDyrcJhCfADUtfjRo/pucnoCWovZ2rHUpVQ=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v2 05/12] test: event-thread: Destroy Object from correct\n\tthread context","Date":"Tue, 23 Jan 2024 03:12:42 +0200","Message-ID":"<20240123011249.22716-6-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 EventHandler used in the test is destroyed from the main thread,\nwhich is invalid for a thread-bound object bound to a different thread.\nFix it by destroying it with deleteLater().\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Milan Zamazal \n---\n test/event-thread.cpp | 37 +++++++++++++++++++++++++++----------\n 1 file changed, 27 insertions(+), 10 deletions(-)","diff":"diff --git a/test/event-thread.cpp b/test/event-thread.cpp\nindex 88a8c07ef9f0..d6e5d27af185 100644\n--- a/test/event-thread.cpp\n+++ b/test/event-thread.cpp\n@@ -85,10 +85,17 @@ private:\n class EventThreadTest : public Test\n {\n protected:\n+\tint init()\n+\t{\n+\t\tthread_.start();\n+\n+\t\thandler_ = new EventHandler();\n+\n+\t\treturn TestPass;\n+\t}\n+\n \tint run()\n \t{\n-\t\tThread thread;\n-\t\tthread.start();\n \n \t\t/*\n \t\t * Fire the event notifier and then move the notifier to a\n@@ -98,23 +105,33 @@ protected:\n \t\t * different thread will correctly process already pending\n \t\t * events in the new thread.\n \t\t */\n-\t\tEventHandler handler;\n-\t\thandler.notify();\n-\t\thandler.moveToThread(&thread);\n+\t\thandler_->notify();\n+\t\thandler_->moveToThread(&thread_);\n \n \t\tthis_thread::sleep_for(chrono::milliseconds(100));\n \n-\t\t/* Must stop thread before destroying the handler. */\n-\t\tthread.exit(0);\n-\t\tthread.wait();\n-\n-\t\tif (!handler.notified()) {\n+\t\tif (!handler_->notified()) {\n \t\t\tcout << \"Thread event handling test failed\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n \n \t\treturn TestPass;\n \t}\n+\n+\tvoid cleanup()\n+\t{\n+\t\t/*\n+\t\t * Object class instances must be destroyed from the thread\n+\t\t * they live in.\n+\t\t */\n+\t\thandler_->deleteLater();\n+\t\tthread_.exit(0);\n+\t\tthread_.wait();\n+\t}\n+\n+private:\n+\tEventHandler *handler_;\n+\tThread thread_;\n };\n \n TEST_REGISTER(EventThreadTest)\n","prefixes":["v2","05/12"]}