From patchwork Tue Feb 2 22:10:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 11109 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 82AF3BD161 for ; Tue, 2 Feb 2021 22:11:26 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6070668439; Tue, 2 Feb 2021 23:11:26 +0100 (CET) Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 156CB60307 for ; Tue, 2 Feb 2021 23:11:25 +0100 (CET) X-Halon-ID: 93f4b597-65a3-11eb-b73f-0050569116f7 Authorized-sender: niklas.soderlund@fsdn.se Received: from bismarck.berto.se (p4fca2458.dip0.t-ipconnect.de [79.202.36.88]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA id 93f4b597-65a3-11eb-b73f-0050569116f7; Tue, 02 Feb 2021 23:11:20 +0100 (CET) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Tue, 2 Feb 2021 23:10:49 +0100 Message-Id: <20210202221051.1740237-2-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210202221051.1740237-1-niklas.soderlund@ragnatech.se> References: <20210202221051.1740237-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 1/3] cam: event_loop: Rename event_ to base_ X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The 'event' variable name is usually used for events added to the base event loop, not the loop itself. Rename the struct event_base member to base_ as a preparation for future work adding events to the loop. There is no functional change. Signed-off-by: Niklas Söderlund Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- src/cam/event_loop.cpp | 8 ++++---- src/cam/event_loop.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cam/event_loop.cpp b/src/cam/event_loop.cpp index 94c5d1d362455f33..3a2b665abdc063de 100644 --- a/src/cam/event_loop.cpp +++ b/src/cam/event_loop.cpp @@ -18,7 +18,7 @@ EventLoop::EventLoop() assert(!instance_); evthread_use_pthreads(); - event_ = event_base_new(); + base_ = event_base_new(); instance_ = this; } @@ -26,7 +26,7 @@ EventLoop::~EventLoop() { instance_ = nullptr; - event_base_free(event_); + event_base_free(base_); libevent_global_shutdown(); } @@ -42,7 +42,7 @@ int EventLoop::exec() while (!exit_.load(std::memory_order_acquire)) { dispatchCalls(); - event_base_loop(event_, EVLOOP_NO_EXIT_ON_EMPTY); + event_base_loop(base_, EVLOOP_NO_EXIT_ON_EMPTY); } return exitCode_; @@ -57,7 +57,7 @@ void EventLoop::exit(int code) void EventLoop::interrupt() { - event_base_loopbreak(event_); + event_base_loopbreak(base_); } void EventLoop::callLater(const std::function &func) diff --git a/src/cam/event_loop.h b/src/cam/event_loop.h index 408073c50594d09d..d0d5b5a53c830670 100644 --- a/src/cam/event_loop.h +++ b/src/cam/event_loop.h @@ -30,7 +30,7 @@ public: private: static EventLoop *instance_; - struct event_base *event_; + struct event_base *base_; std::atomic exit_; int exitCode_;