{"id":19458,"url":"https://patchwork.libcamera.org/api/1.1/patches/19458/?format=json","web_url":"https://patchwork.libcamera.org/patch/19458/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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-11-laurent.pinchart@ideasonboard.com>","date":"2024-01-23T01:12:47","name":"[v2,10/12] test: timer-thread: Destroy Object from correct thread context","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"bdfcb04d4e89d78c984b5a730fab15e111b690b3","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19458/mbox/","series":[{"id":4157,"url":"https://patchwork.libcamera.org/api/1.1/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/19458/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19458/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 737E1C32C3\n\tfor ;\n\tTue, 23 Jan 2024 01:13:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 164F46294F;\n\tTue, 23 Jan 2024 02:13:03 +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 78A926297F\n\tfor ;\n\tTue, 23 Jan 2024 02:12:59 +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 23690E4;\n\tTue, 23 Jan 2024 02:11:46 +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=\"EPVvuIgQ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1705972306;\n\tbh=4VK46g9gxjQEAtaVW9zeOvVEgCmYZf55aXihFgS9XTM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=EPVvuIgQt+EMk2JlswtN83qGO3l2SNFSScizZ4lxxHXntCBmZaLNtBJsN5CzVv2Sk\n\toVkCk5kNQ2J54/F1P1YTkCCsnPn/K2zUCr5dc2OJch6Tr+eL9BXwt8te5RBNB5ptYt\n\tYEZJIdNMxCGAcLTGfqUzX6Fms+O2qPuxzQeFaZm4=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v2 10/12] test: timer-thread: Destroy Object from correct\n\tthread context","Date":"Tue, 23 Jan 2024 03:12:47 +0200","Message-ID":"<20240123011249.22716-11-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 TimeoutHandler 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/timer-fail.cpp | 16 +++++++++++-----\n test/timer-thread.cpp | 14 ++++++++++----\n 2 files changed, 21 insertions(+), 9 deletions(-)","diff":"diff --git a/test/timer-fail.cpp b/test/timer-fail.cpp\nindex 2c622ca3410d..82854b89630d 100644\n--- a/test/timer-fail.cpp\n+++ b/test/timer-fail.cpp\n@@ -54,7 +54,9 @@ protected:\n \tint init()\n \t{\n \t\tthread_.start();\n-\t\ttimeout_.moveToThread(&thread_);\n+\n+\t\ttimeout_ = new TimeoutHandler();\n+\t\ttimeout_->moveToThread(&thread_);\n \n \t\treturn TestPass;\n \t}\n@@ -67,7 +69,7 @@ protected:\n \t\t * event dispatcher to make sure we don't succeed simply because\n \t\t * the event dispatcher hasn't noticed the timer restart.\n \t\t */\n-\t\ttimeout_.start();\n+\t\ttimeout_->start();\n \t\tthread_.eventDispatcher()->interrupt();\n \n \t\tthis_thread::sleep_for(chrono::milliseconds(200));\n@@ -79,7 +81,7 @@ protected:\n \t\t * to return TestPass in the unexpected (usually known as\n \t\t * \"fail\") case, and TestFail otherwise.\n \t\t */\n-\t\tif (timeout_.timeout()) {\n+\t\tif (timeout_->timeout()) {\n \t\t\tcout << \"Timer start from wrong thread succeeded unexpectedly\"\n \t\t\t << endl;\n \t\t\treturn TestPass;\n@@ -90,13 +92,17 @@ protected:\n \n \tvoid cleanup()\n \t{\n-\t\t/* Must stop thread before destroying timeout. */\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\ttimeout_->deleteLater();\n \t\tthread_.exit(0);\n \t\tthread_.wait();\n \t}\n \n private:\n-\tTimeoutHandler timeout_;\n+\tTimeoutHandler *timeout_;\n \tThread thread_;\n };\n \ndiff --git a/test/timer-thread.cpp b/test/timer-thread.cpp\nindex 4caf4e33b2ba..8675e2480aa9 100644\n--- a/test/timer-thread.cpp\n+++ b/test/timer-thread.cpp\n@@ -50,7 +50,9 @@ protected:\n \tint init()\n \t{\n \t\tthread_.start();\n-\t\ttimeout_.moveToThread(&thread_);\n+\n+\t\ttimeout_ = new TimeoutHandler();\n+\t\ttimeout_->moveToThread(&thread_);\n \n \t\treturn TestPass;\n \t}\n@@ -63,7 +65,7 @@ protected:\n \t\t */\n \t\tthis_thread::sleep_for(chrono::milliseconds(200));\n \n-\t\tif (!timeout_.timeout()) {\n+\t\tif (!timeout_->timeout()) {\n \t\t\tcout << \"Timer expiration test failed\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -73,13 +75,17 @@ protected:\n \n \tvoid cleanup()\n \t{\n-\t\t/* Must stop thread before destroying timeout. */\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\ttimeout_->deleteLater();\n \t\tthread_.exit(0);\n \t\tthread_.wait();\n \t}\n \n private:\n-\tTimeoutHandler timeout_;\n+\tTimeoutHandler *timeout_;\n \tThread thread_;\n };\n \n","prefixes":["v2","10/12"]}