{"id":3267,"url":"https://patchwork.libcamera.org/api/1.1/patches/3267/?format=json","web_url":"https://patchwork.libcamera.org/patch/3267/","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":"<20200323173559.21109-2-laurent.pinchart@ideasonboard.com>","date":"2020-03-23T17:35:39","name":"[libcamera-devel,v2,01/21] qcam: Remove custom event dispatcher","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"4fe15048cb7cfeff3dc5f4a110ccee1b3529e382","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/3267/mbox/","series":[{"id":762,"url":"https://patchwork.libcamera.org/api/1.1/series/762/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=762","date":"2020-03-23T17:35:38","name":"qcam: Bypass format conversion when not required","version":2,"mbox":"https://patchwork.libcamera.org/series/762/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3267/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3267/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C904A60417\n\tfor ;\n\tMon, 23 Mar 2020 18:36:16 +0100 (CET)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 68B04A31\n\tfor ;\n\tMon, 23 Mar 2020 18:36:16 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1584984976;\n\tbh=TnPSnCbjQeF7XKN3+DusUtKMbfyZQsZ9rRHhgh+WbUg=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=qt90/3T5hs/8Qk4SeFmJ/Vy4ilFE8ls4JmQxxxMlsRXCMYMzDmfqCw5pdQqPiAs90\n\tSMF5eMSFu5ZsgqDqQpSyFE3IEpXb6NEZU5b16Nb7scVWPppj+cH9vyHlExtMKoV7fm\n\tyrEuePwC7nsozpiMyhUJo6yVwmFetnAN/isaIFus=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 23 Mar 2020 19:35:39 +0200","Message-Id":"<20200323173559.21109-2-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200323173559.21109-1-laurent.pinchart@ideasonboard.com>","References":"<20200323173559.21109-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 01/21] qcam: Remove custom event\n\tdispatcher","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","X-List-Received-Date":"Mon, 23 Mar 2020 17:36:17 -0000"},"content":"The qcam application installs a custom event dispatcher based on the Qt\nevent loop. As the camera manager now creates an internal thread, it\ndoesn't use that event dispatcher of the application thread at all.\n\nFurthermore, the custom event dispatcher is buggy, as it doesn't\ndispatch messages posted to the main thread's event loop. This isn't an\nissue as no messages are posted there in the first place, but would\ncause incorrect behaviour if we were to use that feature (for instance\nto deliver signals from the camera manager thread to the application\nthread).\n\nFixing the event dispatcher requires a change in the libcamera public\nAPI, as there's currently no way to dispatch messages using the public\nAPI (Thread::dispatchMessages() is not exposed). This isn't worth it at\nthe moment, so just remove the custom event dispatcher. If qcam later\nneeds the libcamera request and buffer completion signals to be\ndelivered in the application thread, it will need to handle that\ninternally, using Qt's cross-thread signal delivery.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \n---\n src/qcam/main.cpp | 3 -\n src/qcam/meson.build | 1 -\n src/qcam/qt_event_dispatcher.cpp | 152 -------------------------------\n src/qcam/qt_event_dispatcher.h | 62 -------------\n 4 files changed, 218 deletions(-)\n delete mode 100644 src/qcam/qt_event_dispatcher.cpp\n delete mode 100644 src/qcam/qt_event_dispatcher.h","diff":"diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp\nindex a7ff5c52663b..297453914ae9 100644\n--- a/src/qcam/main.cpp\n+++ b/src/qcam/main.cpp\n@@ -15,7 +15,6 @@\n \n #include \"main_window.h\"\n #include \"../cam/options.h\"\n-#include \"qt_event_dispatcher.h\"\n \n void signalHandler(int signal)\n {\n@@ -62,9 +61,7 @@ int main(int argc, char **argv)\n \tsa.sa_handler = &signalHandler;\n \tsigaction(SIGINT, &sa, nullptr);\n \n-\tstd::unique_ptr dispatcher(new QtEventDispatcher());\n \tCameraManager *cm = new CameraManager();\n-\tcm->setEventDispatcher(std::move(dispatcher));\n \n \tret = cm->start();\n \tif (ret) {\ndiff --git a/src/qcam/meson.build b/src/qcam/meson.build\nindex 5150631b55c8..214bfb12aabb 100644\n--- a/src/qcam/meson.build\n+++ b/src/qcam/meson.build\n@@ -3,7 +3,6 @@ qcam_sources = files([\n 'main.cpp',\n 'main_window.cpp',\n '../cam/options.cpp',\n- 'qt_event_dispatcher.cpp',\n 'viewfinder.cpp',\n ])\n \ndiff --git a/src/qcam/qt_event_dispatcher.cpp b/src/qcam/qt_event_dispatcher.cpp\ndeleted file mode 100644\nindex 2780c9123ac3..000000000000\n--- a/src/qcam/qt_event_dispatcher.cpp\n+++ /dev/null\n@@ -1,152 +0,0 @@\n-/* SPDX-License-Identifier: GPL-2.0-or-later */\n-/*\n- * Copyright (C) 2019, Google Inc.\n- *\n- * qt_event_dispatcher.cpp - qcam - Qt-based event dispatcher\n- */\n-\n-#include \n-#include \n-\n-#include \n-#include \n-#include \n-#include \n-\n-#include \n-#include \n-\n-#include \"qt_event_dispatcher.h\"\n-\n-using namespace libcamera;\n-\n-QtEventDispatcher::QtEventDispatcher()\n-{\n-}\n-\n-QtEventDispatcher::~QtEventDispatcher()\n-{\n-\tfor (auto &it : notifiers_) {\n-\t\tNotifierSet &set = it.second;\n-\t\tdelete set.read.qnotifier;\n-\t\tdelete set.write.qnotifier;\n-\t\tdelete set.exception.qnotifier;\n-\t}\n-}\n-\n-void QtEventDispatcher::registerEventNotifier(EventNotifier *notifier)\n-{\n-\tNotifierSet &set = notifiers_[notifier->fd()];\n-\tQSocketNotifier::Type qtype;\n-\tvoid (QtEventDispatcher::*method)(int);\n-\tNotifierPair *pair;\n-\n-\tswitch (notifier->type()) {\n-\tcase EventNotifier::Read:\n-\tdefault:\n-\t\tqtype = QSocketNotifier::Read;\n-\t\tmethod = &QtEventDispatcher::readNotifierActivated;\n-\t\tpair = &set.read;\n-\t\tbreak;\n-\n-\tcase EventNotifier::Write:\n-\t\tqtype = QSocketNotifier::Write;\n-\t\tmethod = &QtEventDispatcher::writeNotifierActivated;\n-\t\tpair = &set.write;\n-\t\tbreak;\n-\n-\tcase EventNotifier::Exception:\n-\t\tqtype = QSocketNotifier::Exception;\n-\t\tmethod = &QtEventDispatcher::exceptionNotifierActivated;\n-\t\tpair = &set.exception;\n-\t\tbreak;\n-\t}\n-\n-\tQSocketNotifier *qnotifier = new QSocketNotifier(notifier->fd(), qtype);\n-\tconnect(qnotifier, &QSocketNotifier::activated, this, method);\n-\tpair->notifier = notifier;\n-\tpair->qnotifier = qnotifier;\n-}\n-\n-void QtEventDispatcher::unregisterEventNotifier(EventNotifier *notifier)\n-{\n-\tNotifierSet &set = notifiers_[notifier->fd()];\n-\tNotifierPair *pair;\n-\n-\tswitch (notifier->type()) {\n-\tcase EventNotifier::Read:\n-\tdefault:\n-\t\tpair = &set.read;\n-\t\tbreak;\n-\n-\tcase EventNotifier::Write:\n-\t\tpair = &set.write;\n-\t\tbreak;\n-\n-\tcase EventNotifier::Exception:\n-\t\tpair = &set.exception;\n-\t\tbreak;\n-\t}\n-\n-\tdelete pair->qnotifier;\n-\tpair->qnotifier = nullptr;\n-\tpair->notifier = nullptr;\n-}\n-\n-void QtEventDispatcher::readNotifierActivated(int socket)\n-{\n-\tEventNotifier *notifier = notifiers_[socket].read.notifier;\n-\tnotifier->activated.emit(notifier);\n-}\n-\n-void QtEventDispatcher::writeNotifierActivated(int socket)\n-{\n-\tEventNotifier *notifier = notifiers_[socket].write.notifier;\n-\tnotifier->activated.emit(notifier);\n-}\n-\n-void QtEventDispatcher::exceptionNotifierActivated(int socket)\n-{\n-\tEventNotifier *notifier = notifiers_[socket].exception.notifier;\n-\tnotifier->activated.emit(notifier);\n-}\n-\n-void QtEventDispatcher::registerTimer(Timer *timer)\n-{\n-\tstd::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();\n-\tstd::chrono::steady_clock::duration duration = timer->deadline() - now;\n-\tstd::chrono::milliseconds msec =\n-\t\tstd::chrono::duration_cast(duration);\n-\tint timerId = startTimer(msec.count());\n-\ttimers_[timerId] = timer;\n-\ttimerIds_[timer] = timerId;\n-}\n-\n-void QtEventDispatcher::unregisterTimer(Timer *timer)\n-{\n-\tauto it = timerIds_.find(timer);\n-\tif (it == timerIds_.end())\n-\t\treturn;\n-\n-\ttimers_.erase(it->second);\n-\tkillTimer(it->second);\n-\ttimerIds_.erase(it);\n-}\n-\n-void QtEventDispatcher::timerEvent(QTimerEvent *event)\n-{\n-\tTimer *timer = timers_[event->timerId()];\n-\ttimer->stop();\n-\ttimer->timeout.emit(timer);\n-}\n-\n-void QtEventDispatcher::processEvents()\n-{\n-\tstd::cout << \"QtEventDispatcher::processEvents() should not be called\"\n-\t\t << std::endl;\n-}\n-\n-void QtEventDispatcher::interrupt()\n-{\n-\tQCoreApplication::eventDispatcher()->interrupt();\n-}\ndiff --git a/src/qcam/qt_event_dispatcher.h b/src/qcam/qt_event_dispatcher.h\ndeleted file mode 100644\nindex b0f123e52d06..000000000000\n--- a/src/qcam/qt_event_dispatcher.h\n+++ /dev/null\n@@ -1,62 +0,0 @@\n-/* SPDX-License-Identifier: GPL-2.0-or-later */\n-/*\n- * Copyright (C) 2019, Google Inc.\n- *\n- * qt_event_dispatcher.h - qcam - Qt-based event dispatcher\n- */\n-#ifndef __QCAM_QT_EVENT_DISPATCHER_H__\n-#define __QCAM_QT_EVENT_DISPATCHER_H__\n-\n-#include \n-\n-#include \n-\n-using namespace libcamera;\n-\n-class QSocketNotifier;\n-\n-class QtEventDispatcher final : public EventDispatcher, public QObject\n-{\n-public:\n-\tQtEventDispatcher();\n-\t~QtEventDispatcher();\n-\n-\tvoid registerEventNotifier(EventNotifier *notifier);\n-\tvoid unregisterEventNotifier(EventNotifier *notifier);\n-\n-\tvoid registerTimer(Timer *timer);\n-\tvoid unregisterTimer(Timer *timer);\n-\n-\tvoid processEvents();\n-\n-\tvoid interrupt();\n-\n-protected:\n-\tvoid timerEvent(QTimerEvent *event);\n-\n-private:\n-\tvoid readNotifierActivated(int socket);\n-\tvoid writeNotifierActivated(int socket);\n-\tvoid exceptionNotifierActivated(int socket);\n-\n-\tstruct NotifierPair {\n-\t\tNotifierPair()\n-\t\t\t: notifier(nullptr), qnotifier(nullptr)\n-\t\t{\n-\t\t}\n-\t\tEventNotifier *notifier;\n-\t\tQSocketNotifier *qnotifier;\n-\t};\n-\n-\tstruct NotifierSet {\n-\t\tNotifierPair read;\n-\t\tNotifierPair write;\n-\t\tNotifierPair exception;\n-\t};\n-\n-\tstd::map notifiers_;\n-\tstd::map timers_;\n-\tstd::map timerIds_;\n-};\n-\n-#endif /* __QCAM_QT_EVENT_DISPATCHER_H__ */\n","prefixes":["libcamera-devel","v2","01/21"]}