From 297c9c3fa081a98f4f8657fe19ef33e6cec10bd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>
Date: Tue, 2 Feb 2021 21:20:21 +0100
Subject: cam: event_loop: Rename event_ to base_
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
src/cam/event_loop.cpp | 8 ++++----
src/cam/event_loop.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'src/cam')
diff --git a/src/cam/event_loop.cpp b/src/cam/event_loop.cpp
index 94c5d1d3..3a2b665a 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<void()> &func)
diff --git a/src/cam/event_loop.h b/src/cam/event_loop.h
index 408073c5..d0d5b5a5 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<bool> exit_;
int exitCode_;
--
cgit v1.2.1