[{"id":2431,"web_url":"https://patchwork.libcamera.org/comment/2431/","msgid":"<20190817142412.GI16603@wyvern>","date":"2019-08-17T14:24:12","subject":"Re: [libcamera-devel] [PATCH 05/18] libcamera: bound_method:\n\tDecouple from Signal implementation","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your work.\n\nOn 2019-08-12 15:46:29 +0300, Laurent Pinchart wrote:\n> To make the BoundMethod classes more generic, replace direct access to\n> private member from Signal classes with accessors or helper functions.\n> This allows removal of friend statements from the BoundMethod classes.\n\nI love to lose these toxic friends ;-)\n\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> include/libcamera/bound_method.h | 11 +++++------\n> include/libcamera/signal.h | 12 +++++++-----\n> src/libcamera/bound_method.cpp | 6 ------\n> 3 files changed, 12 insertions(+), 17 deletions(-)\n> \n> diff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h\n> index 38c44b923ba1..54c40fc52e3b 100644\n> --- a/include/libcamera/bound_method.h\n> +++ b/include/libcamera/bound_method.h\n> @@ -13,9 +13,6 @@\n> namespace libcamera {\n> \n> class Object;\n> -template\n> -class Signal;\n> -class SignalBase;\n> \n> class BoundMethodBase\n> {\n> @@ -28,7 +25,7 @@ public:\n> \tbool match(T *obj) { return obj == obj_; }\n> \tbool match(Object *object) { return object == object_; }\n> \n> -\tvoid disconnect(SignalBase *signal);\n> +\tObject *object() const { return object_; }\n> \n> \tvoid activatePack(void *pack);\n> \tvirtual void invokePack(void *pack) = 0;\n> @@ -93,6 +90,8 @@ public:\n> \tBoundMemberMethod(T *obj, Object *object, void (T::*func)(Args...))\n> \t\t: BoundMethodArgs(obj, object), func_(func) {}\n> \n> +\tbool match(void (T::*func)(Args...)) const { return func == func_; }\n> +\n> \tvoid activate(Args... args)\n> \t{\n> \t\tif (this->object_)\n> @@ -107,7 +106,6 @@ public:\n> \t}\n> \n> private:\n> -\tfriend class Signal;\n> \tvoid (T::*func_)(Args...);\n> };\n> \n> @@ -118,11 +116,12 @@ public:\n> \tBoundStaticMethod(void (*func)(Args...))\n> \t\t: BoundMethodArgs(nullptr, nullptr), func_(func) {}\n> \n> +\tbool match(void (*func)(Args...)) const { return func == func_; }\n> +\n> \tvoid activate(Args... args) { (*func_)(args...); }\n> \tvoid invoke(Args... args) {}\n> \n> private:\n> -\tfriend class Signal;\n> \tvoid (*func_)(Args...);\n> };\n> \n> diff --git a/include/libcamera/signal.h b/include/libcamera/signal.h\n> index 3b6de30f7d35..b8a60281cceb 100644\n> --- a/include/libcamera/signal.h\n> +++ b/include/libcamera/signal.h\n> @@ -46,7 +46,9 @@ public:\n> \t~Signal()\n> \t{\n> \t\tfor (BoundMethodBase *slot : slots_) {\n> -\t\t\tslot->disconnect(this);\n> +\t\t\tObject *object = slot->object();\n> +\t\t\tif (object)\n> +\t\t\t\tobject->disconnect(this);\n> \t\t\tdelete slot;\n> \t\t}\n> \t}\n> @@ -95,11 +97,11 @@ public:\n> \t\t\t/*\n> \t\t\t * If the object matches the slot, the slot is\n> \t\t\t * guaranteed to be a member slot, so we can safely\n> -\t\t\t * cast it to BoundMemberMethod and access its\n> -\t\t\t * func_ member.\n> +\t\t\t * cast it to BoundMemberMethod to match\n> +\t\t\t * func.\n> \t\t\t */\n> \t\t\tif (slot->match(obj) &&\n> -\t\t\t static_cast *>(slot)->func_ == func) {\n> +\t\t\t static_cast *>(slot)->match(func)) {\n> \t\t\t\titer = slots_.erase(iter);\n> \t\t\t\tdelete slot;\n> \t\t\t} else {\n> @@ -113,7 +115,7 @@ public:\n> \t\tfor (auto iter = slots_.begin(); iter != slots_.end(); ) {\n> \t\t\tBoundMethodArgs *slot = *iter;\n> \t\t\tif (slot->match(nullptr) &&\n> -\t\t\t static_cast *>(slot)->func_ == func) {\n> +\t\t\t static_cast *>(slot)->match(func)) {\n> \t\t\t\titer = slots_.erase(iter);\n> \t\t\t\tdelete slot;\n> \t\t\t} else {\n> diff --git a/src/libcamera/bound_method.cpp b/src/libcamera/bound_method.cpp\n> index 0a2d61a6c805..23b8f4122283 100644\n> --- a/src/libcamera/bound_method.cpp\n> +++ b/src/libcamera/bound_method.cpp\n> @@ -13,12 +13,6 @@\n> \n> namespace libcamera {\n> \n> -void BoundMethodBase::disconnect(SignalBase *signal)\n> -{\n> -\tif (object_)\n> -\t\tobject_->disconnect(signal);\n> -}\n> -\n> void BoundMethodBase::activatePack(void *pack)\n> {\n> \tif (Thread::current() == object_->thread()) {\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from mail-ed1-x541.google.com (mail-ed1-x541.google.com\n\t[IPv6:2a00:1450:4864:20::541])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 76AC3600F9\n\tfor ;\n\tSat, 17 Aug 2019 16:29:43 +0200 (CEST)","by mail-ed1-x541.google.com with SMTP id w20so7513952edd.2\n\tfor ;\n\tSat, 17 Aug 2019 07:29:43 -0700 (PDT)","from localhost ([185.224.57.161]) by smtp.gmail.com with ESMTPSA id\n\t9sm1230375ejw.63.2019.08.17.07.24.13\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 17 Aug 2019 07:24:13 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to\n\t:user-agent; bh=jH50z96QJnLuwt8zNN75hBddGF6vqD1baK5FVSHpG04=;\n\tb=i7KdVqSYxb9JJkxYsoTb/+AWsLoLBN+CUUua79nbj6VLiJRCyahoZ5hEoWARaVfB8+\n\tkFx5FwRHCi8SwozvgNcGuNVx85ZqDjNHefWpp7kyuRke12Wav7InZo4EzVtzt4/SaHHt\n\txjBjwtVARnuL90ap7x8D7EtxYwr0bYwf1LKCnlA/hV+Lnn8U8nmHdznQmhx3twOOWj8N\n\t2T5eMVJrvVar4idNeCPXL0Ng/G2KR5vaEpCuhvAqRNBgL46DIaP2BeWqmSW9qr98xzOv\n\tTl9OPQ/YcmhjZXP7mV8kTtutKXjpySum/Pfaf5m0lTK48pwDppOkfetqXxn/HT0Hg6GZ\n\ta43Q==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to:user-agent;\n\tbh=jH50z96QJnLuwt8zNN75hBddGF6vqD1baK5FVSHpG04=;\n\tb=abISPmoPQDb7NkGeyajWWv3JhEaz6JpWuAgqMvg2q7MaUs8A4U4vMxTJUhcaqr+A38\n\t/f4BWHsQCdXSMAF26Hh95WZP0nJW832JeCKKiFRGTqBad1+rMQKRC09xHHIy9lwSvowO\n\t1LhQyg55jk+aynwcXK6V4NjZUI1NGEQOuSDsJQCQCtErlOJ6mctV5i8v/vpHuguw4jJu\n\tCLzgFpiN7t0a22oYYgjJDBw3aIPI/Ywb+DVvCc4ut5z6G8vD6FYGhgW0368QnFOs5BiW\n\to3xLoZ7ZPMNb49+7Eg43OJBEb4d22qObeLXR62SzZSr+0qoQO6VdrgXq6pUKn9N6Hss4\n\tnSsA==","X-Gm-Message-State":"APjAAAWdKhDOgzhKaRMDt4SPSadcN7L3+JuQO66f5hlXWue3FcCvd1FA\n\t95QbyRt/Pxn2Yt08zVn8QcKoAA==","X-Google-Smtp-Source":"APXvYqzMJ3IsOKM53qfExtLH1VT1tmcy15c4Grj/F+R1vsysqfc+zXCReLNPQh98v7M8lDamjfFsGQ==","X-Received":"by 2002:a50:ce5a:: with SMTP id\n\tk26mr16363046edj.218.1566051854473; \n\tSat, 17 Aug 2019 07:24:14 -0700 (PDT)","Date":"Sat, 17 Aug 2019 16:24:12 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190817142412.GI16603@wyvern>","References":"<20190812124642.24287-1-laurent.pinchart@ideasonboard.com>\n\t<20190812124642.24287-6-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190812124642.24287-6-laurent.pinchart@ideasonboard.com>","User-Agent":"Mutt/1.12.1 (2019-06-15)","Subject":"Re: [libcamera-devel] [PATCH 05/18] libcamera: bound_method:\n\tDecouple from Signal implementation","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":"Sat, 17 Aug 2019 14:29:43 -0000"}}]