{"id":670,"url":"https://patchwork.libcamera.org/api/patches/670/?format=json","web_url":"https://patchwork.libcamera.org/patch/670/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20190228200151.2948-3-jacopo@jmondi.org>","date":"2019-02-28T20:01:44","name":"[libcamera-devel,v5,2/9] libcamera: v4l2_subdevice: Inherit from Loggable","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"73c8b546920733b5ad7cd8edea0605ada60ac9c8","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/670/mbox/","series":[{"id":198,"url":"https://patchwork.libcamera.org/api/series/198/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=198","date":"2019-02-28T20:01:42","name":"v4l2_(sub)dev: improvements and tests","version":4,"mbox":"https://patchwork.libcamera.org/series/198/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/670/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/670/checks/","tags":{},"headers":{"Return-Path":"","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 D7FF1610BF\n\tfor ;\n\tThu, 28 Feb 2019 21:01:31 +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 0D65210000A;\n\tThu, 28 Feb 2019 20:01:30 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 28 Feb 2019 21:01:44 +0100","Message-Id":"<20190228200151.2948-3-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190228200151.2948-1-jacopo@jmondi.org>","References":"<20190228200151.2948-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 2/9] libcamera: v4l2_subdevice: Inherit\n\tfrom Loggable","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 28 Feb 2019 20:01:32 -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 \nReviewed-by: Laurent Pinchart \nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/include/v4l2_subdevice.h | 6 +++++-\n src/libcamera/v4l2_subdevice.cpp | 13 +++++++++----\n 2 files changed, 14 insertions(+), 5 deletions(-)","diff":"diff --git a/src/libcamera/include/v4l2_subdevice.h b/src/libcamera/include/v4l2_subdevice.h\nindex eac699a06109..669e79f9a9fd 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 \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;\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..4fe59c45f000 100644\n--- a/src/libcamera/v4l2_subdevice.cpp\n+++ b/src/libcamera/v4l2_subdevice.cpp\n@@ -154,6 +154,11 @@ void V4L2Subdevice::close()\n * \\return The name of the media entity the subdevice is associated to\n */\n \n+std::string V4L2Subdevice::logPrefix() const\n+{\n+\treturn \"'\" + deviceName() + \"'\";\n+}\n+\n /**\n * \\brief Set a crop rectangle on one of the V4L2 subdevice pads\n * \\param[in] pad The 0-indexed pad number the rectangle is to be applied to\n@@ -196,7 +201,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 +236,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 +268,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","v5","2/9"]}