{"id":12926,"url":"https://patchwork.libcamera.org/api/1.1/patches/12926/?format=json","web_url":"https://patchwork.libcamera.org/patch/12926/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210712215645.30478-14-laurent.pinchart@ideasonboard.com>","date":"2021-07-12T21:56:28","name":"[libcamera-devel,v2,13/30] cam: camera_session: Access event loop through global instance","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b066e1c34a78a759afa349b520a3324b43a8e1b7","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12926/mbox/","series":[{"id":2229,"url":"https://patchwork.libcamera.org/api/1.1/series/2229/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2229","date":"2021-07-12T21:56:15","name":"Multi-camera support in the cam application","version":2,"mbox":"https://patchwork.libcamera.org/series/2229/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12926/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12926/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 4BEE0C3229\n\tfor ;\n\tMon, 12 Jul 2021 21:57:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D0E8B6855B;\n\tMon, 12 Jul 2021 23:57:48 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2ED8E68531\n\tfor ;\n\tMon, 12 Jul 2021 23:57:40 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C9BC33F1\n\tfor ;\n\tMon, 12 Jul 2021 23:57:39 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"vJ/PHTx1\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626127059;\n\tbh=rIhvtB3w5fduVbqUYzhKblh9+JsjkCTndBVFakGjcgQ=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=vJ/PHTx1sK5Ok2b7sIKUK4KsIZbDa3fjuTxdX/Mk8biBAv41KlSKmOTLFUU15QV8w\n\t1xKekwN6hkqyKjS6emYwbk5xpssQMUxkbeoAwu31wkCd5ICghZMIG3HaifYokHXC1s\n\tkQL1FkkiouBtaXYMhDc6fpTX1Kz25bCTH1H4mJSM=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 13 Jul 2021 00:56:28 +0300","Message-Id":"<20210712215645.30478-14-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210712215645.30478-1-laurent.pinchart@ideasonboard.com>","References":"<20210712215645.30478-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 13/30] cam: camera_session: Access\n\tevent loop through global instance","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Don't pass the event loop to the CameraSession constructor, as passing\nthis global object explicitly isn't a design that can scale.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \n---\n src/cam/camera_session.cpp | 11 ++++++-----\n src/cam/camera_session.h | 6 ++----\n src/cam/main.cpp | 2 +-\n 3 files changed, 9 insertions(+), 10 deletions(-)","diff":"diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex 439dcdb29ad7..b26c7974056d 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -13,13 +13,14 @@\n #include \n \n #include \"camera_session.h\"\n+#include \"event_loop.h\"\n #include \"main.h\"\n \n using namespace libcamera;\n \n CameraSession::CameraSession(std::shared_ptr camera,\n-\t\t\t CameraConfiguration *config, EventLoop *loop)\n-\t: camera_(camera), config_(config), writer_(nullptr), last_(0), loop_(loop),\n+\t\t\t CameraConfiguration *config)\n+\t: camera_(camera), config_(config), writer_(nullptr), last_(0),\n \t queueCount_(0), captureCount_(0), captureLimit_(0),\n \t printMetadata_(false)\n {\n@@ -145,7 +146,7 @@ int CameraSession::capture(FrameBufferAllocator *allocator)\n \telse\n \t\tstd::cout << \"Capture until user interrupts by SIGINT\" << std::endl;\n \n-\tret = loop_->exec();\n+\tret = EventLoop::instance()->exec();\n \tif (ret)\n \t\tstd::cout << \"Failed to run capture loop\" << std::endl;\n \n@@ -175,7 +176,7 @@ void CameraSession::requestComplete(Request *request)\n \t * Defer processing of the completed request to the event loop, to avoid\n \t * blocking the camera manager thread.\n \t */\n-\tloop_->callLater([=]() { processRequest(request); });\n+\tEventLoop::instance()->callLater([=]() { processRequest(request); });\n }\n \n void CameraSession::processRequest(Request *request)\n@@ -231,7 +232,7 @@ void CameraSession::processRequest(Request *request)\n \n \tcaptureCount_++;\n \tif (captureLimit_ && captureCount_ >= captureLimit_) {\n-\t\tloop_->exit(0);\n+\t\tEventLoop::instance()->exit(0);\n \t\treturn;\n \t}\n \ndiff --git a/src/cam/camera_session.h b/src/cam/camera_session.h\nindex ef8a11c3bfb4..270ba3e929e7 100644\n--- a/src/cam/camera_session.h\n+++ b/src/cam/camera_session.h\n@@ -18,17 +18,16 @@\n #include \n \n #include \"buffer_writer.h\"\n-#include \"event_loop.h\"\n #include \"options.h\"\n \n class CameraSession\n {\n public:\n \tCameraSession(std::shared_ptr camera,\n-\t\t libcamera::CameraConfiguration *config,\n-\t\t EventLoop *loop);\n+\t\t libcamera::CameraConfiguration *config);\n \n \tint run(const OptionsParser::Options &options);\n+\n private:\n \tint capture(libcamera::FrameBufferAllocator *allocator);\n \n@@ -43,7 +42,6 @@ private:\n \tBufferWriter *writer_;\n \tuint64_t last_;\n \n-\tEventLoop *loop_;\n \tunsigned int queueCount_;\n \tunsigned int captureCount_;\n \tunsigned int captureLimit_;\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex f71b65a20fe2..90435206d386 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -363,7 +363,7 @@ int CamApp::run()\n \t}\n \n \tif (options_.isSet(OptCapture)) {\n-\t\tCameraSession session(camera_, config_.get(), &loop_);\n+\t\tCameraSession session(camera_, config_.get());\n \t\treturn session.run(options_);\n \t}\n \n","prefixes":["libcamera-devel","v2","13/30"]}