{"id":15292,"url":"https://patchwork.libcamera.org/api/patches/15292/?format=json","web_url":"https://patchwork.libcamera.org/patch/15292/","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":"<20220121142420.3531497-3-kieran.bingham@ideasonboard.com>","date":"2022-01-21T14:24:20","name":"[libcamera-devel,v3,2/2] libcamera: base: object: Prevent the same signal being connected more than once","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"bfd389b20b26c951e35226250dd06defd6f7d9b4","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":{"id":11,"url":"https://patchwork.libcamera.org/api/users/11/?format=json","username":"kbingham","first_name":"Kieran","last_name":"Bingham","email":"kieran.bingham@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/15292/mbox/","series":[{"id":2900,"url":"https://patchwork.libcamera.org/api/series/2900/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2900","date":"2022-01-21T14:24:18","name":"libcamera: pipeline_handler: Register requests","version":3,"mbox":"https://patchwork.libcamera.org/series/2900/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15292/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15292/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 6CB92BF415\n\tfor ;\n\tFri, 21 Jan 2022 14:24:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 532C96017A;\n\tFri, 21 Jan 2022 15:24:27 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0DF3F60983\n\tfor ;\n\tFri, 21 Jan 2022 15:24:25 +0100 (CET)","from Monstersaurus.local\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A0C239FF;\n\tFri, 21 Jan 2022 15:24:24 +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=\"LK5hsp/W\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1642775064;\n\tbh=yMovVWJ6RG3IzvC/325nRMz/Xk0zPA1FzPTOYDnUjlo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=LK5hsp/WYdPlHMHPXATvy0frnNUuNXbhFkOJ3Qg7gkHJ1SBctOTmwdrV56jW6m4eR\n\tXYMCE44Hpg4vI/r5oXuvw4TEoWz19O3Z0IrU+NBgXQ1e8RD84+mMnjA7kuaddS80/A\n\tDN+zuacYPfGLF6Fbegk+6BW2/04qPxr+RzMd0vEI=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Fri, 21 Jan 2022 14:24:20 +0000","Message-Id":"<20220121142420.3531497-3-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20220121142420.3531497-1-kieran.bingham@ideasonboard.com>","References":"<20220121142420.3531497-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 2/2] libcamera: base: object: Prevent\n\tthe same signal being connected more than once","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":"Objects shouldn't be connected to the same signal more than once. Doing\nso indicates a bug in the code, and can be highlighted in debug builds\nwith an assert that performs a lookup on the signals_ list.\n\nRemove the support in the test framework which uses multiple Signal\nconnections on the same object.\n\nSigned-off-by: Kieran Bingham \nReviewed-by: Jacopo Mondi \n---\n\nv2:\n - Move assertion / validation to object instead of signal.\n - This equivalent list assertion in signal does not trap the reported\n issue, while this does validate and trap on the reported bug.\n\n src/libcamera/base/object.cpp | 6 ++++++\n test/signal.cpp | 8 ++------\n 2 files changed, 8 insertions(+), 6 deletions(-)","diff":"diff --git a/src/libcamera/base/object.cpp b/src/libcamera/base/object.cpp\nindex 3f28768e48f8..7311b1d5a3a1 100644\n--- a/src/libcamera/base/object.cpp\n+++ b/src/libcamera/base/object.cpp\n@@ -284,6 +284,12 @@ void Object::notifyThreadMove()\n \n void Object::connect(SignalBase *signal)\n {\n+\t/*\n+\t * Connecting the same signal to an object multiple times is not\n+\t * supported.\n+\t */\n+\tASSERT(signals_.end() == std::find(signals_.begin(), signals_.end(), signal));\n+\n \tsignals_.push_back(signal);\n }\n \ndiff --git a/test/signal.cpp b/test/signal.cpp\nindex fcf2def18df4..a1effaab0346 100644\n--- a/test/signal.cpp\n+++ b/test/signal.cpp\n@@ -212,14 +212,12 @@ protected:\n \t\t/* ----------------- Signal -> Object tests ----------------- */\n \n \t\t/*\n-\t\t * Test automatic disconnection on object deletion. Connect the\n-\t\t * slot twice to ensure all instances are disconnected.\n+\t\t * Test automatic disconnection on object deletion.\n \t\t */\n \t\tsignalVoid_.disconnect();\n \n \t\tSlotObject *slotObject = new SlotObject();\n \t\tsignalVoid_.connect(slotObject, &SlotObject::slot);\n-\t\tsignalVoid_.connect(slotObject, &SlotObject::slot);\n \t\tdelete slotObject;\n \t\tvalueStatic_ = 0;\n \t\tsignalVoid_.emit();\n@@ -298,14 +296,12 @@ protected:\n \t\t/* --------- Signal -> Object (multiple inheritance) -------- */\n \n \t\t/*\n-\t\t * Test automatic disconnection on object deletion. Connect the\n-\t\t * slot twice to ensure all instances are disconnected.\n+\t\t * Test automatic disconnection on object deletion.\n \t\t */\n \t\tsignalVoid_.disconnect();\n \n \t\tSlotMulti *slotMulti = new SlotMulti();\n \t\tsignalVoid_.connect(slotMulti, &SlotMulti::slot);\n-\t\tsignalVoid_.connect(slotMulti, &SlotMulti::slot);\n \t\tdelete slotMulti;\n \t\tvalueStatic_ = 0;\n \t\tsignalVoid_.emit();\n","prefixes":["libcamera-devel","v3","2/2"]}