Patch Detail
Show a patch.
GET /api/1.1/patches/641/?format=api
{ "id": 641, "url": "https://patchwork.libcamera.org/api/1.1/patches/641/?format=api", "web_url": "https://patchwork.libcamera.org/patch/641/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20190227173837.6902-3-jacopo@jmondi.org>", "date": "2019-02-27T17:38:31", "name": "[libcamera-devel,v4,2/8] libcamera: v4l2_subdevice: Inherit from Loggable", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "06fda9306bd608d3bf5657a245a8e7ca88d86d73", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/641/mbox/", "series": [ { "id": 194, "url": "https://patchwork.libcamera.org/api/1.1/series/194/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=194", "date": "2019-02-27T17:38:29", "name": "v4l2_(sub)dev: improvements and tests", "version": 4, "mbox": "https://patchwork.libcamera.org/series/194/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/641/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/641/checks/", "tags": {}, "headers": { "Return-Path": "<jacopo@jmondi.org>", "Received": [ "from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1880A610B6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 27 Feb 2019 18:38:15 +0100 (CET)", "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id 6683A100009;\n\tWed, 27 Feb 2019 17:38:14 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 27 Feb 2019 18:38:31 +0100", "Message-Id": "<20190227173837.6902-3-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190227173837.6902-1-jacopo@jmondi.org>", "References": "<20190227173837.6902-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 2/8] libcamera: v4l2_subdevice: Inherit\n\tfrom Loggable", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "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": "Wed, 27 Feb 2019 17:38:15 -0000" }, "content": "Prefix the V4L2Subdevice error messages with the name of the entity.\nRemove the manually printed name from log messages where it was used and\nstandardize error messages while at there.\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/include/v4l2_subdevice.h | 6 +++++-\n src/libcamera/v4l2_subdevice.cpp | 8 ++++----\n 2 files changed, 9 insertions(+), 5 deletions(-)", "diff": "diff --git a/src/libcamera/include/v4l2_subdevice.h b/src/libcamera/include/v4l2_subdevice.h\nindex eac699a06109..dc311034a8ee 100644\n--- a/src/libcamera/include/v4l2_subdevice.h\n+++ b/src/libcamera/include/v4l2_subdevice.h\n@@ -9,6 +9,7 @@\n \n #include <string>\n \n+#include \"log.h\"\n #include \"media_object.h\"\n \n namespace libcamera {\n@@ -21,7 +22,7 @@ struct V4L2SubdeviceFormat {\n \tuint32_t height;\n };\n \n-class V4L2Subdevice\n+class V4L2Subdevice : protected Loggable\n {\n public:\n \texplicit V4L2Subdevice(const MediaEntity *entity);\n@@ -41,6 +42,9 @@ public:\n \tint getFormat(unsigned int pad, V4L2SubdeviceFormat *format);\n \tint setFormat(unsigned int pad, V4L2SubdeviceFormat *format);\n \n+protected:\n+\tstd::string logPrefix() const { return \"'\" + deviceName() + \"'\"; }\n+\n private:\n \tint setSelection(unsigned int pad, unsigned int target,\n \t\t\t Rectangle *rect);\ndiff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\nindex c44cafd4b4c5..dbb54506ee41 100644\n--- a/src/libcamera/v4l2_subdevice.cpp\n+++ b/src/libcamera/v4l2_subdevice.cpp\n@@ -196,7 +196,7 @@ int V4L2Subdevice::getFormat(unsigned int pad, V4L2SubdeviceFormat *format)\n \t\tret = -errno;\n \t\tLOG(V4L2Subdev, Error)\n \t\t\t<< \"Unable to get format on pad \" << pad\n-\t\t\t<< \" of \" << deviceNode() << \": \" << strerror(-ret);\n+\t\t\t<< \": \" << strerror(-ret);\n \t\treturn ret;\n \t}\n \n@@ -231,7 +231,8 @@ int V4L2Subdevice::setFormat(unsigned int pad, V4L2SubdeviceFormat *format)\n \tif (ret) {\n \t\tret = -errno;\n \t\tLOG(V4L2Subdev, Error)\n-\t\t\t<< \"Unable to set format: \" << strerror(-ret);\n+\t\t\t<< \"Unable to set format on pad \" << pad\n+\t\t\t<< \": \" << strerror(-ret);\n \t\treturn ret;\n \t}\n \n@@ -262,8 +263,7 @@ int V4L2Subdevice::setSelection(unsigned int pad, unsigned int target,\n \t\tret = -errno;\n \t\tLOG(V4L2Subdev, Error)\n \t\t\t<< \"Unable to set rectangle \" << target << \" on pad \"\n-\t\t\t<< pad << \" of \" << deviceNode() << \": \"\n-\t\t\t<< strerror(-ret);\n+\t\t\t<< pad << \": \" << strerror(-ret);\n \t\treturn ret;\n \t}\n \n", "prefixes": [ "libcamera-devel", "v4", "2/8" ] }