[{"id":22051,"web_url":"https://patchwork.libcamera.org/comment/22051/","msgid":"<20220119084701.cxpvphrbsy6mv4ru@uno.localdomain>","date":"2022-01-19T08:47:01","subject":"Re: [libcamera-devel] [PATCH v2 2/2] libcamera: base: object:\n\tPrevent the same signal being connected more than once","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Kieran,\n\nOn Wed, Jan 19, 2022 at 12:17:17AM +0000, Kieran Bingham wrote:\n> Objects shouldn't be connected to the same signal more than once. Doing\n> so indicates a bug in the code, and can be highlighted in debug builds\n> with an assert that performs a lookup on the signals_ list.\n>\n> Remove the support in the test framework which uses multiple Signal\n> connections on the same object.\n>\n> Signed-off-by: Kieran Bingham \n\nThis seems better than an arbitrary limit\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> ---\n> src/libcamera/base/object.cpp | 6 ++++++\n> test/signal.cpp | 8 ++------\n> 2 files changed, 8 insertions(+), 6 deletions(-)\n>\n> diff --git a/src/libcamera/base/object.cpp b/src/libcamera/base/object.cpp\n> index 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>\n> diff --git a/test/signal.cpp b/test/signal.cpp\n> index 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> --\n> 2.32.0\n>","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 5088CBE086\n\tfor ;\n\tWed, 19 Jan 2022 08:46:01 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9F40E60868;\n\tWed, 19 Jan 2022 09:46:00 +0100 (CET)","from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F3FB16017F\n\tfor ;\n\tWed, 19 Jan 2022 09:45:58 +0100 (CET)","(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id 5F93D240006;\n\tWed, 19 Jan 2022 08:45:58 +0000 (UTC)"],"Date":"Wed, 19 Jan 2022 09:47:01 +0100","From":"Jacopo Mondi ","To":"Kieran Bingham ","Message-ID":"<20220119084701.cxpvphrbsy6mv4ru@uno.localdomain>","References":"<20220119001717.2503111-1-kieran.bingham@ideasonboard.com>\n\t<20220119001717.2503111-3-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20220119001717.2503111-3-kieran.bingham@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 2/2] libcamera: base: object:\n\tPrevent the 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","Cc":"libcamera devel ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]