Patch Detail
Show a patch.
GET /api/patches/2074/?format=api
{ "id": 2074, "url": "https://patchwork.libcamera.org/api/patches/2074/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2074/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20190930215906.1058301-3-niklas.soderlund@ragnatech.se>", "date": "2019-09-30T21:59:05", "name": "[libcamera-devel,v3,2/3] qcam: Stop timer on timeout", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "9680a2ab78075a27266cc85d23ca7cbbf1985f9b", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/2074/mbox/", "series": [ { "id": 514, "url": "https://patchwork.libcamera.org/api/series/514/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=514", "date": "2019-09-30T21:59:03", "name": "qcam: Fix issues in the Qt event dispatcher", "version": 3, "mbox": "https://patchwork.libcamera.org/series/514/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/2074/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2074/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7A65E61656\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 30 Sep 2019 23:59:51 +0200 (CEST)", "from bismarck.berto.se (unknown [84.172.88.101])\n\tby bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 905b7e6b-e3cd-11e9-bdc3-005056917a89;\n\tMon, 30 Sep 2019 23:59:24 +0200 (CEST)" ], "X-Halon-ID": "905b7e6b-e3cd-11e9-bdc3-005056917a89", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "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", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "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": "<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": "Mon, 30 Sep 2019 21:59:52 -0000" }, "content": "Stopping the timer will reset the Timer::deadline_ field to 0 fixing\npotential bugs and call QtEventDispatcher::unregisterTimer() which will\ntake care of the cleanup.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/qcam/qt_event_dispatcher.cpp | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)", "diff": "diff --git a/src/qcam/qt_event_dispatcher.cpp b/src/qcam/qt_event_dispatcher.cpp\nindex 98d2472c37856642..43588ef081a3f633 100644\n--- a/src/qcam/qt_event_dispatcher.cpp\n+++ b/src/qcam/qt_event_dispatcher.cpp\n@@ -131,9 +131,9 @@ void QtEventDispatcher::unregisterTimer(Timer *timer)\n void QtEventDispatcher::timerEvent(QTimerEvent *event)\n {\n \tauto it = timers_.find(event->timerId());\n-\ttimerIds_.erase(it->second);\n-\tkillTimer(it->first);\n-\ttimers_.erase(it);\n+\tTimer *timer = it->second;\n+\n+\ttimer->stop();\n }\n \n void QtEventDispatcher::processEvents()\n", "prefixes": [ "libcamera-devel", "v3", "2/3" ] }