From patchwork Fri Jan 25 14:54:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 378 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 75D9660B1D for ; Fri, 25 Jan 2019 15:54:24 +0100 (CET) Received: from pendragon.home (unknown [IPv6:2a02:a03f:4499:2700:1060:1d4c:d6a:8e80]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id ECA13325 for ; Fri, 25 Jan 2019 15:54:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1548428061; bh=WgJyvxZAT4V1OiJYdki6SXSK3lNV1pqyRymoATteDt0=; h=From:To:Subject:Date:From; b=UdcSnmizGRVL6OlF0gLHjoZdG+HDtQV6W1CRcSVpoqIgHx+itO9y2Ne4osbD194PK QzaYnXAZPes+btFooIxDbxZDrt+eWvEcNDq1S8JMIWo2exmrUEkxxQhp2QS4ls+9x0 7QCas92td1+xPToiHFo9aOEXbfc/K/Xx7b7j3Rig= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 25 Jan 2019 16:54:17 +0200 Message-Id: <20190125145417.5384-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] cam: Add event loop 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: Fri, 25 Jan 2019 14:54:24 -0000 Add a simple event loop to the cam application and use it in the main() function, with an example of how to handle SIGINT to gracefully stop the loop. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/cam/event_loop.cpp | 39 +++++++++++++++++++++++++++++++++++++++ src/cam/event_loop.h | 34 ++++++++++++++++++++++++++++++++++ src/cam/main.cpp | 22 +++++++++++++++++++++- src/cam/meson.build | 1 + 4 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 src/cam/event_loop.cpp create mode 100644 src/cam/event_loop.h diff --git a/src/cam/event_loop.cpp b/src/cam/event_loop.cpp new file mode 100644 index 000000000000..e8ab861790ed --- /dev/null +++ b/src/cam/event_loop.cpp @@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * event_loop.cpp - cam - Event loop + */ + +#include + +#include "event_loop.h" + +using namespace libcamera; + +EventLoop::EventLoop(EventDispatcher *dispatcher) + : dispatcher_(dispatcher) +{ +} + +EventLoop::~EventLoop() +{ +} + +int EventLoop::exec() +{ + exitCode_ = -1; + exit_.store(false, std::memory_order_release); + + while (!exit_.load(std::memory_order_acquire)) + dispatcher_->processEvents(); + + return exitCode_; +} + +void EventLoop::exit(int code) +{ + exitCode_ = code; + exit_.store(true, std::memory_order_release); + dispatcher_->interrupt(); +} diff --git a/src/cam/event_loop.h b/src/cam/event_loop.h new file mode 100644 index 000000000000..aaca5838f979 --- /dev/null +++ b/src/cam/event_loop.h @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * event_loop.h - cam - Event loop + */ +#ifndef __CAM_EVENT_LOOP_H__ +#define __CAM_EVENT_LOOP_H__ + +#include + +#include + +namespace libcamera { +class EventDispatcher; +}; + +class EventLoop +{ +public: + EventLoop(libcamera::EventDispatcher *dispatcher); + ~EventLoop(); + + int exec(); + void exit(int code = 0); + +private: + libcamera::EventDispatcher *dispatcher_; + + std::atomic exit_; + int exitCode_; +}; + +#endif /* __CAM_EVENT_LOOP_H__ */ diff --git a/src/cam/main.cpp b/src/cam/main.cpp index 0d37039f5349..cb98d302dcf3 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -7,10 +7,12 @@ #include #include +#include #include #include +#include "event_loop.h" #include "options.h" using namespace libcamera; @@ -23,6 +25,14 @@ enum { OptList = 'l', }; +EventLoop *loop; + +void signalHandler(int signal) +{ + std::cout << "Exiting" << std::endl; + loop->exit(); +} + static int parseOptions(int argc, char *argv[]) { OptionsParser parser; @@ -79,7 +89,17 @@ int main(int argc, char **argv) } } + loop = new EventLoop(cm->eventDispatcher()); + + struct sigaction sa = {}; + sa.sa_handler = &signalHandler; + sigaction(SIGINT, &sa, nullptr); + + ret = loop->exec(); + + delete loop; + cm->stop(); - return 0; + return ret; } diff --git a/src/cam/meson.build b/src/cam/meson.build index e45e5391f679..cc647523955f 100644 --- a/src/cam/meson.build +++ b/src/cam/meson.build @@ -1,4 +1,5 @@ cam_sources = files([ + 'event_loop.cpp', 'main.cpp', 'options.cpp', ])