Patch Detail
Show a patch.
GET /api/patches/15214/?format=api
{ "id": 15214, "url": "https://patchwork.libcamera.org/api/patches/15214/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15214/", "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": "<20211223023331.13505-3-laurent.pinchart@ideasonboard.com>", "date": "2021-12-23T02:33:31", "name": "[libcamera-devel,2/2] libcamera: pipeline_handler: Make lock() and unlock() thread-safe", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "fee9ab3ad2219c41d08d9f7d9aacf2c0a064ac25", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/15214/mbox/", "series": [ { "id": 2863, "url": "https://patchwork.libcamera.org/api/series/2863/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2863", "date": "2021-12-23T02:33:29", "name": "libcamera: Small cleanups for pipeline handler locking", "version": 1, "mbox": "https://patchwork.libcamera.org/series/2863/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15214/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15214/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 E2168C3259\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 23 Dec 2021 02:33:42 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8C9B46090B;\n\tThu, 23 Dec 2021 03:33:42 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 08D7D605A8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 23 Dec 2021 03:33:39 +0100 (CET)", "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A5E112C5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 23 Dec 2021 03:33:38 +0100 (CET)" ], "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=\"NY07XJxi\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1640226818;\n\tbh=Jmee5JD33DGh0kY0Nf5KZfvRNfrLPYEuIOYaPZU1bR8=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=NY07XJxi2lmTY4AmE6iY1KrEDJ13dL+CMVmEGRAwHOSrVjiutTbIPPFnoA52fsuWH\n\t+Z5YAIDvGqVC/fTA9MQNRuR+0pMBU3ZlghdToidOqVXIA720RR7d5+93KnOaPpKJyT\n\tQH7Kxs/r21FrfEr/6OgH6hky+rs4EyDS96BxNe4Q=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 23 Dec 2021 04:33:31 +0200", "Message-Id": "<20211223023331.13505-3-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.32.0", "In-Reply-To": "<20211223023331.13505-1-laurent.pinchart@ideasonboard.com>", "References": "<20211223023331.13505-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 2/2] libcamera: pipeline_handler: Make\n\tlock() and unlock() thread-safe", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The PipelineHandler lock() and unlock() functions are documented as\nthread-safe, but they're not. Fix them using a mutex.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n include/libcamera/internal/pipeline_handler.h | 2 ++\n src/libcamera/pipeline_handler.cpp | 5 +++++\n 2 files changed, 7 insertions(+)", "diff": "diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex a7331cedfb16..3768bb8f6cb6 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -14,6 +14,7 @@\n #include <sys/types.h>\n #include <vector>\n \n+#include <libcamera/base/mutex.h>\n #include <libcamera/base/object.h>\n \n #include <libcamera/controls.h>\n@@ -88,6 +89,7 @@ private:\n \n \tconst char *name_;\n \n+\tMutex lock_;\n \tbool lockOwner_;\n \n \tfriend class PipelineHandlerFactory;\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex b2ee4ec0ce87..07d9d387daff 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -11,6 +11,7 @@\n #include <sys/sysmacros.h>\n \n #include <libcamera/base/log.h>\n+#include <libcamera/base/mutex.h>\n #include <libcamera/base/utils.h>\n \n #include <libcamera/camera.h>\n@@ -155,6 +156,8 @@ MediaDevice *PipelineHandler::acquireMediaDevice(DeviceEnumerator *enumerator,\n */\n bool PipelineHandler::lock()\n {\n+\tMutexLocker locker(lock_);\n+\n \t/* Do not allow nested locking in the same libcamera instance. */\n \tif (lockOwner_)\n \t\treturn false;\n@@ -183,6 +186,8 @@ bool PipelineHandler::lock()\n */\n void PipelineHandler::unlock()\n {\n+\tMutexLocker locker(lock_);\n+\n \tif (lockOwner_)\n \t\treturn;\n \n", "prefixes": [ "libcamera-devel", "2/2" ] }