From patchwork Mon Aug 12 12:46:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1783 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C2D7B61636 for ; Mon, 12 Aug 2019 14:46:50 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 568C2594 for ; Mon, 12 Aug 2019 14:46:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1565614010; bh=2SZrUbhnrxIu5ZgHJv1Puo1eaAVdKs877QcMW84CIiY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=IpqMv7nVi+5e0ECQXlC7Dt7C3w/xUtuO/oBefInGdRV2ZGbQOswvPi7XP7JvpPxxR YK0+tYpmXcLsCds6M+mX0n/SutIkjaR8nl9OZr19EShORtkL55JpCxDtOOS4NSK8hh ThI0cr8c61tIOCtY00TrXTk2tAf8BEjdj6lpVTXk= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Mon, 12 Aug 2019 15:46:29 +0300 Message-Id: <20190812124642.24287-6-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190812124642.24287-1-laurent.pinchart@ideasonboard.com> References: <20190812124642.24287-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 05/18] libcamera: bound_method: Decouple from Signal implementation X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Aug 2019 12:46:51 -0000 To make the BoundMethod classes more generic, replace direct access to private member from Signal classes with accessors or helper functions. This allows removal of friend statements from the BoundMethod classes. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- include/libcamera/bound_method.h | 11 +++++------ include/libcamera/signal.h | 12 +++++++----- src/libcamera/bound_method.cpp | 6 ------ 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h index 38c44b923ba1..54c40fc52e3b 100644 --- a/include/libcamera/bound_method.h +++ b/include/libcamera/bound_method.h @@ -13,9 +13,6 @@ namespace libcamera { class Object; -template -class Signal; -class SignalBase; class BoundMethodBase { @@ -28,7 +25,7 @@ public: bool match(T *obj) { return obj == obj_; } bool match(Object *object) { return object == object_; } - void disconnect(SignalBase *signal); + Object *object() const { return object_; } void activatePack(void *pack); virtual void invokePack(void *pack) = 0; @@ -93,6 +90,8 @@ public: BoundMemberMethod(T *obj, Object *object, void (T::*func)(Args...)) : BoundMethodArgs(obj, object), func_(func) {} + bool match(void (T::*func)(Args...)) const { return func == func_; } + void activate(Args... args) { if (this->object_) @@ -107,7 +106,6 @@ public: } private: - friend class Signal; void (T::*func_)(Args...); }; @@ -118,11 +116,12 @@ public: BoundStaticMethod(void (*func)(Args...)) : BoundMethodArgs(nullptr, nullptr), func_(func) {} + bool match(void (*func)(Args...)) const { return func == func_; } + void activate(Args... args) { (*func_)(args...); } void invoke(Args... args) {} private: - friend class Signal; void (*func_)(Args...); }; diff --git a/include/libcamera/signal.h b/include/libcamera/signal.h index 3b6de30f7d35..b8a60281cceb 100644 --- a/include/libcamera/signal.h +++ b/include/libcamera/signal.h @@ -46,7 +46,9 @@ public: ~Signal() { for (BoundMethodBase *slot : slots_) { - slot->disconnect(this); + Object *object = slot->object(); + if (object) + object->disconnect(this); delete slot; } } @@ -95,11 +97,11 @@ public: /* * If the object matches the slot, the slot is * guaranteed to be a member slot, so we can safely - * cast it to BoundMemberMethod and access its - * func_ member. + * cast it to BoundMemberMethod to match + * func. */ if (slot->match(obj) && - static_cast *>(slot)->func_ == func) { + static_cast *>(slot)->match(func)) { iter = slots_.erase(iter); delete slot; } else { @@ -113,7 +115,7 @@ public: for (auto iter = slots_.begin(); iter != slots_.end(); ) { BoundMethodArgs *slot = *iter; if (slot->match(nullptr) && - static_cast *>(slot)->func_ == func) { + static_cast *>(slot)->match(func)) { iter = slots_.erase(iter); delete slot; } else { diff --git a/src/libcamera/bound_method.cpp b/src/libcamera/bound_method.cpp index 0a2d61a6c805..23b8f4122283 100644 --- a/src/libcamera/bound_method.cpp +++ b/src/libcamera/bound_method.cpp @@ -13,12 +13,6 @@ namespace libcamera { -void BoundMethodBase::disconnect(SignalBase *signal) -{ - if (object_) - object_->disconnect(signal); -} - void BoundMethodBase::activatePack(void *pack) { if (Thread::current() == object_->thread()) {