[{"id":596,"web_url":"https://patchwork.libcamera.org/comment/596/","msgid":"<20190125151927.GM4127@bigcity.dyn.berto.se>","date":"2019-01-25T15:19:27","subject":"Re: [libcamera-devel] [PATCH] cam: Add event loop","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-01-25 16:54:17 +0200, Laurent Pinchart wrote:\n> Add a simple event loop to the cam application and use it in the main()\n> function, with an example of how to handle SIGINT to gracefully stop the\n> loop.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\n> ---\n>  src/cam/event_loop.cpp | 39 +++++++++++++++++++++++++++++++++++++++\n>  src/cam/event_loop.h   | 34 ++++++++++++++++++++++++++++++++++\n>  src/cam/main.cpp       | 22 +++++++++++++++++++++-\n>  src/cam/meson.build    |  1 +\n>  4 files changed, 95 insertions(+), 1 deletion(-)\n>  create mode 100644 src/cam/event_loop.cpp\n>  create mode 100644 src/cam/event_loop.h\n> \n> diff --git a/src/cam/event_loop.cpp b/src/cam/event_loop.cpp\n> new file mode 100644\n> index 000000000000..e8ab861790ed\n> --- /dev/null\n> +++ b/src/cam/event_loop.cpp\n> @@ -0,0 +1,39 @@\n> +/* SPDX-License-Identifier: GPL-2.0-or-later */\n> +/*\n> + * Copyright (C) 2019, Google Inc.\n> + *\n> + * event_loop.cpp - cam - Event loop\n> + */\n> +\n> +#include <libcamera/event_dispatcher.h>\n> +\n> +#include \"event_loop.h\"\n> +\n> +using namespace libcamera;\n> +\n> +EventLoop::EventLoop(EventDispatcher *dispatcher)\n> +\t: dispatcher_(dispatcher)\n> +{\n> +}\n> +\n> +EventLoop::~EventLoop()\n> +{\n> +}\n> +\n> +int EventLoop::exec()\n> +{\n> +\texitCode_ = -1;\n> +\texit_.store(false, std::memory_order_release);\n> +\n> +\twhile (!exit_.load(std::memory_order_acquire))\n> +\t\tdispatcher_->processEvents();\n> +\n> +\treturn exitCode_;\n> +}\n> +\n> +void EventLoop::exit(int code)\n> +{\n> +\texitCode_ = code;\n> +\texit_.store(true, std::memory_order_release);\n> +\tdispatcher_->interrupt();\n> +}\n> diff --git a/src/cam/event_loop.h b/src/cam/event_loop.h\n> new file mode 100644\n> index 000000000000..aaca5838f979\n> --- /dev/null\n> +++ b/src/cam/event_loop.h\n> @@ -0,0 +1,34 @@\n> +/* SPDX-License-Identifier: GPL-2.0-or-later */\n> +/*\n> + * Copyright (C) 2019, Google Inc.\n> + *\n> + * event_loop.h - cam - Event loop\n> + */\n> +#ifndef __CAM_EVENT_LOOP_H__\n> +#define __CAM_EVENT_LOOP_H__\n> +\n> +#include <atomic>\n> +\n> +#include <libcamera/event_notifier.h>\n> +\n> +namespace libcamera {\n> +class EventDispatcher;\n> +};\n> +\n> +class EventLoop\n> +{\n> +public:\n> +\tEventLoop(libcamera::EventDispatcher *dispatcher);\n> +\t~EventLoop();\n> +\n> +\tint exec();\n> +\tvoid exit(int code = 0);\n> +\n> +private:\n> +\tlibcamera::EventDispatcher *dispatcher_;\n> +\n> +\tstd::atomic<bool> exit_;\n> +\tint exitCode_;\n> +};\n> +\n> +#endif /* __CAM_EVENT_LOOP_H__ */\n> diff --git a/src/cam/main.cpp b/src/cam/main.cpp\n> index 0d37039f5349..cb98d302dcf3 100644\n> --- a/src/cam/main.cpp\n> +++ b/src/cam/main.cpp\n> @@ -7,10 +7,12 @@\n>  \n>  #include <iostream>\n>  #include <map>\n> +#include <signal.h>\n>  #include <string.h>\n>  \n>  #include <libcamera/libcamera.h>\n>  \n> +#include \"event_loop.h\"\n>  #include \"options.h\"\n>  \n>  using namespace libcamera;\n> @@ -23,6 +25,14 @@ enum {\n>  \tOptList = 'l',\n>  };\n>  \n> +EventLoop *loop;\n> +\n> +void signalHandler(int signal)\n> +{\n> +\tstd::cout << \"Exiting\" << std::endl;\n> +\tloop->exit();\n> +}\n> +\n>  static int parseOptions(int argc, char *argv[])\n>  {\n>  \tOptionsParser parser;\n> @@ -79,7 +89,17 @@ int main(int argc, char **argv)\n>  \t\t}\n>  \t}\n>  \n> +\tloop = new EventLoop(cm->eventDispatcher());\n> +\n> +\tstruct sigaction sa = {};\n> +\tsa.sa_handler = &signalHandler;\n> +\tsigaction(SIGINT, &sa, nullptr);\n> +\n> +\tret = loop->exec();\n> +\n> +\tdelete loop;\n> +\n>  \tcm->stop();\n>  \n> -\treturn 0;\n> +\treturn ret;\n>  }\n> diff --git a/src/cam/meson.build b/src/cam/meson.build\n> index e45e5391f679..cc647523955f 100644\n> --- a/src/cam/meson.build\n> +++ b/src/cam/meson.build\n> @@ -1,4 +1,5 @@\n>  cam_sources = files([\n> +    'event_loop.cpp',\n>      'main.cpp',\n>      'options.cpp',\n>  ])\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":"<niklas.soderlund@ragnatech.se>","Received":["from mail-lj1-x241.google.com (mail-lj1-x241.google.com\n\t[IPv6:2a00:1450:4864:20::241])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 20E3260B1B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 25 Jan 2019 16:19:29 +0100 (CET)","by mail-lj1-x241.google.com with SMTP id c19-v6so8669683lja.5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 25 Jan 2019 07:19:29 -0800 (PST)","from localhost (89-233-230-99.cust.bredband2.com. [89.233.230.99])\n\tby smtp.gmail.com with ESMTPSA id\n\tz15-v6sm1742880ljb.9.2019.01.25.07.19.27\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tFri, 25 Jan 2019 07:19:27 -0800 (PST)"],"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=hEg/JfNicdFXG3jKuIRzRN6kSva8qk8iyru2cKptqUw=;\n\tb=Uvhs8Eu88xaeDkoVbOXMbBfBHsGMZ0YmQgeAetzIwZ+A7t6OQMHXCtrbV9cUFCuaGY\n\tI0ejoHb/KQbB0AC8SUomxJELTMrV7HQYlxBoCHQkmHaw1vEjgRpTLE1Fjt1YEiR6GisK\n\tjELMG/T6IVXDKBuzLh/ED9Q20tVyLyDoMvTafTMkJWknAzHrLszu+thjVcT7L6LF89rk\n\tg5wdU+TMP9PmJL5Wjkhd0r62vsND24ivoj7Pi3D9sf4UI+DVz5SFTEJk0CVwkrjOyWHX\n\t6lSaX2hRenuS+iLcsKGmJmJEHdNgFk16bbqcM7cs3MZzixVZ3nx/rwg2H6DEDcv2a5EW\n\tWUzQ==","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=hEg/JfNicdFXG3jKuIRzRN6kSva8qk8iyru2cKptqUw=;\n\tb=XHgsUIbpJgkhOrdjbGki1erSbBy83qpMqmJAq442ikIXTcasKa+Zdr7nkUQ8YRyxCm\n\t8mY/NTlaEuf2x+xVOcD2LoeWF/DDL9URosTZb41gjc3hyqIFSUFY4Zvig0Eaf7kNyVBj\n\tybO9D6f4d7zZyxzSIIf+Yeo9ETrbM5taT/g/sgRMn6jkAMD53lGqlahHPNE+2w+OdokU\n\tu4rJpnnFi5VqOa2Z6ecXwdQjWJEQ/RQ8cCVjlrHhqnvpabLGNU37DYP+UKsGtGPDEDH2\n\t38clmo3nl6am5B4xzNVIYmXf8dov8N3frhcIkDEBx1mQOCGEwOzwLMK6Qvpx8/nHNjyI\n\tBG/Q==","X-Gm-Message-State":"AJcUukeJ787Xr+rkUraEEF1fk8IG1XuCnaso2OWS1BXRr/OG+87XfhUb\n\tkVpJ/CU9dOH2MWfpq/7gijCy6YCmS7U=","X-Google-Smtp-Source":"ALg8bN5pbCQxFN9UJqWqc90JLFnL4RSHUh6CvmdT6dAPYzA1Jm7D5mFBOQ+LMQOt73ggxbNoe3ckOQ==","X-Received":"by 2002:a2e:9a84:: with SMTP id\n\tp4-v6mr9204167lji.73.1548429568390; \n\tFri, 25 Jan 2019 07:19:28 -0800 (PST)","Date":"Fri, 25 Jan 2019 16:19:27 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190125151927.GM4127@bigcity.dyn.berto.se>","References":"<20190125145417.5384-1-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":"<20190125145417.5384-1-laurent.pinchart@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH] cam: Add event loop","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Fri, 25 Jan 2019 15:19:29 -0000"}}]