From patchwork Mon Sep 30 21:59:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 2073 Return-Path: Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D520D61656 for ; Mon, 30 Sep 2019 23:59:50 +0200 (CEST) X-Halon-ID: 8fc3d3cc-e3cd-11e9-bdc3-005056917a89 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [84.172.88.101]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id 8fc3d3cc-e3cd-11e9-bdc3-005056917a89; Mon, 30 Sep 2019 23:59:23 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Mon, 30 Sep 2019 23:59:04 +0200 Message-Id: <20190930215906.1058301-2-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190930215906.1058301-1-niklas.soderlund@ragnatech.se> References: <20190930215906.1058301-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 1/3] qcam: Fix unregister of not registered timer X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Sep 2019 21:59:51 -0000 If an unregistered timer is given to QtEventDispatcher::unregisterTimer() an error is printed and Qt gets confused and locks up. Fix this by following the libcamera documentation that passing a unregistered timer is a no-op. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/qcam/qt_event_dispatcher.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qcam/qt_event_dispatcher.cpp b/src/qcam/qt_event_dispatcher.cpp index 5ba451bf88cef6e8..98d2472c37856642 100644 --- a/src/qcam/qt_event_dispatcher.cpp +++ b/src/qcam/qt_event_dispatcher.cpp @@ -120,6 +120,9 @@ void QtEventDispatcher::registerTimer(Timer *timer) void QtEventDispatcher::unregisterTimer(Timer *timer) { auto it = timerIds_.find(timer); + if (it == timerIds_.end()) + return; + timers_.erase(it->second); killTimer(it->second); timerIds_.erase(it); From patchwork Mon Sep 30 21:59:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 2074 Return-Path: Received: from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net [195.74.38.229]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7A65E61656 for ; Mon, 30 Sep 2019 23:59:51 +0200 (CEST) X-Halon-ID: 905b7e6b-e3cd-11e9-bdc3-005056917a89 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [84.172.88.101]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id 905b7e6b-e3cd-11e9-bdc3-005056917a89; Mon, 30 Sep 2019 23:59:24 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Mon, 30 Sep 2019 23:59:05 +0200 Message-Id: <20190930215906.1058301-3-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190930215906.1058301-1-niklas.soderlund@ragnatech.se> References: <20190930215906.1058301-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/3] qcam: Stop timer on timeout X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Sep 2019 21:59:52 -0000 Stopping the timer will reset the Timer::deadline_ field to 0 fixing potential bugs and call QtEventDispatcher::unregisterTimer() which will take care of the cleanup. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/qcam/qt_event_dispatcher.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qcam/qt_event_dispatcher.cpp b/src/qcam/qt_event_dispatcher.cpp index 98d2472c37856642..43588ef081a3f633 100644 --- a/src/qcam/qt_event_dispatcher.cpp +++ b/src/qcam/qt_event_dispatcher.cpp @@ -131,9 +131,9 @@ void QtEventDispatcher::unregisterTimer(Timer *timer) void QtEventDispatcher::timerEvent(QTimerEvent *event) { auto it = timers_.find(event->timerId()); - timerIds_.erase(it->second); - killTimer(it->first); - timers_.erase(it); + Timer *timer = it->second; + + timer->stop(); } void QtEventDispatcher::processEvents() From patchwork Mon Sep 30 21:59:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 2075 Return-Path: Received: from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net [195.74.38.228]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DD3E061658 for ; Mon, 30 Sep 2019 23:59:51 +0200 (CEST) X-Halon-ID: 90c2f444-e3cd-11e9-bdc3-005056917a89 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [84.172.88.101]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id 90c2f444-e3cd-11e9-bdc3-005056917a89; Mon, 30 Sep 2019 23:59:25 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Mon, 30 Sep 2019 23:59:06 +0200 Message-Id: <20190930215906.1058301-4-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190930215906.1058301-1-niklas.soderlund@ragnatech.se> References: <20190930215906.1058301-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 3/3] qcam: Fix timers not emitting timeout signal X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Sep 2019 21:59:52 -0000 The timer signal was never emitted in QtEventDispatcher::timerEvent(), this results in timers not working as designed running under the Qt event loop. Fix this by emitting the signal on timeout. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/qcam/qt_event_dispatcher.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qcam/qt_event_dispatcher.cpp b/src/qcam/qt_event_dispatcher.cpp index 43588ef081a3f633..d7d1fed290851e6e 100644 --- a/src/qcam/qt_event_dispatcher.cpp +++ b/src/qcam/qt_event_dispatcher.cpp @@ -134,6 +134,7 @@ void QtEventDispatcher::timerEvent(QTimerEvent *event) Timer *timer = it->second; timer->stop(); + timer->timeout.emit(timer); } void QtEventDispatcher::processEvents()