{"id":1655,"url":"https://patchwork.libcamera.org/api/1.1/patches/1655/?format=json","web_url":"https://patchwork.libcamera.org/patch/1655/","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":"<20190711125609.7331-1-laurent.pinchart@ideasonboard.com>","date":"2019-07-11T12:56:08","name":"[libcamera-devel,1/2] test: signal: Extend Signal test with multi-inheritance reeiver","commit_ref":"b462f2bfd6c5672a7e2f108bd2fcd4b419f1b25b","pull_url":null,"state":"accepted","archived":false,"hash":"52e9d015591a97a44d4c43899c57f8d8e6272e56","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/1655/mbox/","series":[{"id":418,"url":"https://patchwork.libcamera.org/api/1.1/series/418/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=418","date":"2019-07-11T12:56:08","name":"[libcamera-devel,1/2] test: signal: Extend Signal test with multi-inheritance reeiver","version":1,"mbox":"https://patchwork.libcamera.org/series/418/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1655/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1655/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2950160C2F\n\tfor ;\n\tThu, 11 Jul 2019 14:56:42 +0200 (CEST)","from pendragon.ideasonboard.com (softbank126163157105.bbtec.net\n\t[126.163.157.105])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A605831C\n\tfor ;\n\tThu, 11 Jul 2019 14:56:40 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1562849801;\n\tbh=tzemjhXXhncskt5OqDuq3eX8HGMa0oJZgFDtzp5ry80=;\n\th=From:To:Subject:Date:From;\n\tb=BGeP5OOdURJXJd0ZXtt8b+qSckCCOgNbixHF0g845lro5ISxM4qE1Aig47Ux+0sBv\n\t/NugyLACBaHDEfnia2nOb8zSX0zO2qC95QGIL/pJvCHZPvFHkIJnurGJRQk5Hxik/s\n\tIIV+WleEEMVe2ffRdMAv8dDNOR2cUHldwDsbOhN4=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 11 Jul 2019 15:56:08 +0300","Message-Id":"<20190711125609.7331-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.21.0","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 1/2] test: signal: Extend Signal test with\n\tmulti-inheritance reeiver","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 11 Jul 2019 12:56:42 -0000"},"content":"Add tests that exercises the Object-related signal code paths (in\nparticular automatic disconnection on Signal deletion) when the receiver\ninherits from multiple base classes, with Object being the second base.\nThis tests the casts to and from Object * in the signal implementation.\n\nThe new tests segfault due bugs in the signal/slot implementation.\n\nSigned-off-by: Laurent Pinchart \n---\n test/signal.cpp | 74 +++++++++++++++++++++++++++++++++++++++++++++++--\n 1 file changed, 71 insertions(+), 3 deletions(-)","diff":"diff --git a/test/signal.cpp b/test/signal.cpp\nindex 79668b421511..9d8f985d15e5 100644\n--- a/test/signal.cpp\n+++ b/test/signal.cpp\n@@ -32,6 +32,29 @@ public:\n \t}\n };\n \n+class BaseClass\n+{\n+public:\n+\t/*\n+\t * A virtual method is required in the base class, otherwise the compiler\n+\t * will always store Object before BaseClass in memory.\n+\t */\n+\tvirtual ~BaseClass()\n+\t{\n+\t}\n+\n+\tunsigned int data_[32];\n+};\n+\n+class SlotMulti : public BaseClass, public Object\n+{\n+public:\n+\tvoid slot()\n+\t{\n+\t\tvalueStatic_ = 1;\n+\t}\n+};\n+\n class SignalTest : public Test\n {\n protected:\n@@ -69,6 +92,8 @@ protected:\n \n \tint run()\n \t{\n+\t\t/* ----------------- Signal -> !Object tests ---------------- */\n+\n \t\t/* Test signal emission and reception. */\n \t\tcalled_ = false;\n \t\tsignalVoid_.connect(this, &SignalTest::slotVoid);\n@@ -149,6 +174,8 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \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@@ -170,10 +197,10 @@ protected:\n \t\t * Test that signal deletion disconnects objects. This shall\n \t\t * not generate any valgrind warning.\n \t\t */\n-\t\tSignal<> *signal = new Signal<>();\n+\t\tSignal<> *dynamicSignal = new Signal<>();\n \t\tslotObject = new SlotObject();\n-\t\tsignal->connect(slotObject, &SlotObject::slot);\n-\t\tdelete signal;\n+\t\tdynamicSignal->connect(slotObject, &SlotObject::slot);\n+\t\tdelete dynamicSignal;\n \t\tdelete slotObject;\n \n \t\t/* Exercise the Object slot code paths. */\n@@ -188,6 +215,47 @@ protected:\n \n \t\tdelete slotObject;\n \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 */\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+\t\tif (valueStatic_ != 0) {\n+\t\t\tcout << \"Signal disconnection on object deletion test failed\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\t/*\n+\t\t * Test that signal deletion disconnects objects. This shall\n+\t\t * not generate any valgrind warning.\n+\t\t */\n+\t\tdynamicSignal = new Signal<>();\n+\t\tslotMulti = new SlotMulti();\n+\t\tdynamicSignal->connect(slotMulti, &SlotMulti::slot);\n+\t\tdelete dynamicSignal;\n+\t\tdelete slotMulti;\n+\n+\t\t/* Exercise the Object slot code paths. */\n+\t\tslotMulti = new SlotMulti();\n+\t\tsignalVoid_.connect(slotMulti, &SlotMulti::slot);\n+\t\tvalueStatic_ = 0;\n+\t\tsignalVoid_.emit();\n+\t\tif (valueStatic_ == 0) {\n+\t\t\tcout << \"Signal delivery for Object test failed\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tdelete slotMulti;\n+\n \t\treturn TestPass;\n \t}\n \n","prefixes":["libcamera-devel","1/2"]}