{"id":10093,"url":"https://patchwork.libcamera.org/api/1.1/patches/10093/?format=json","web_url":"https://patchwork.libcamera.org/patch/10093/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20201019102529.28359-2-paul.elder@ideasonboard.com>","date":"2020-10-19T10:25:29","name":"[libcamera-devel,RFC,2/2,DO,NOT,MERGE] libcamera: uvcvideo, request: Add tracepoints","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"227fe83e16bdf8ddf5ae0ffb24a29ca570a7168e","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/users/17/?format=json","username":"epaul","first_name":"Paul","last_name":"Elder","email":"paul.elder@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/10093/mbox/","series":[{"id":1383,"url":"https://patchwork.libcamera.org/api/1.1/series/1383/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1383","date":"2020-10-19T10:25:28","name":"[libcamera-devel,RFC,1/2] libcamera: tracing: Implement tracing infrastructure","version":1,"mbox":"https://patchwork.libcamera.org/series/1383/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10093/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10093/checks/","tags":{},"headers":{"Return-Path":"","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 15C74BDB13\n\tfor ;\n\tMon, 19 Oct 2020 10:25:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D5B20613B9;\n\tMon, 19 Oct 2020 12:25:44 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7128760CE6\n\tfor ;\n\tMon, 19 Oct 2020 12:25:43 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E441048;\n\tMon, 19 Oct 2020 12:25:41 +0200 (CEST)"],"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=\"iTewMI+E\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1603103143;\n\tbh=rRoJhzJzGSfugpMegRHU33P6BAY2YBiH7+QcK13EVMg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=iTewMI+E7I2XAIrxHEVBvK4dVC6G46taQKum72bck4lq2N1/Ti6EEQtQzs11D23HC\n\t4ds9a+T1Euu3A1996jc2G97c3YHB4e2Hrz4bRqtBGMm/UzO/oVqorGlOL8Xc+KLDR1\n\tPqJx0Xhj/JLoxzZroSgTCBw0OzuVNrA3UB4ucZTg=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 19 Oct 2020 19:25:29 +0900","Message-Id":"<20201019102529.28359-2-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20201019102529.28359-1-paul.elder@ideasonboard.com>","References":"<20201019102529.28359-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [RFC PATCH 2/2] [DO NOT MERGE] libcamera:\n\tuvcvideo, request: Add tracepoints","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add and use tracepoints in the uvcvideo pipeline handler and Request.\nThis is only meant to show how one would create and use tracepoints.\n\nSigned-off-by: Paul Elder \n\n---\nSetting log level is also available. I haven't tested it yet, but in\ntheory is should Just Work (TM). It looks like you can set log levels on\nthe event definitions, and not when you emit the events.\n---\n .../internal/tracepoints/meson.build | 2 +\n .../libcamera/internal/tracepoints/request.tp | 91 +++++++++++++++++++\n .../internal/tracepoints/uvcvideo.tp | 13 +++\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 3 +\n src/libcamera/request.cpp | 16 ++++\n 5 files changed, 125 insertions(+)\n create mode 100644 include/libcamera/internal/tracepoints/request.tp\n create mode 100644 include/libcamera/internal/tracepoints/uvcvideo.tp","diff":"diff --git a/include/libcamera/internal/tracepoints/meson.build b/include/libcamera/internal/tracepoints/meson.build\nindex 2dd6733e..3ec53fbc 100644\n--- a/include/libcamera/internal/tracepoints/meson.build\n+++ b/include/libcamera/internal/tracepoints/meson.build\n@@ -1,4 +1,6 @@\n # SPDX-License-Identifier: CC0-1.0\n \n tracepoint_files = files([\n+ 'request.tp',\n+ 'uvcvideo.tp',\n ])\ndiff --git a/include/libcamera/internal/tracepoints/request.tp b/include/libcamera/internal/tracepoints/request.tp\nnew file mode 100644\nindex 00000000..c64bbd43\n--- /dev/null\n+++ b/include/libcamera/internal/tracepoints/request.tp\n@@ -0,0 +1,91 @@\n+TRACEPOINT_EVENT_CLASS(\n+\tlibcamera,\n+\trequest,\n+\tTP_ARGS(\n+\t\tuint64_t, cookie,\n+\t\tint, status,\n+\t\tint, cancelled\n+\t),\n+\tTP_FIELDS(\n+\t\tctf_integer(uint64_t, cookie, cookie)\n+\t\tctf_integer(int, status, status)\n+\t\tctf_integer(int, cancelled, cancelled)\n+\t)\n+)\n+\n+TRACEPOINT_EVENT_INSTANCE(\n+\tlibcamera,\n+\trequest,\n+\trequest_construct,\n+\tTP_ARGS(\n+\t\tuint64_t, cookie,\n+\t\tint, status,\n+\t\tint, cancelled\n+\t)\n+)\n+\n+TRACEPOINT_EVENT_INSTANCE(\n+\tlibcamera,\n+\trequest,\n+\trequest_deconstruct,\n+\tTP_ARGS(\n+\t\tuint64_t, cookie,\n+\t\tint, status,\n+\t\tint, cancelled\n+\t)\n+)\n+\n+TRACEPOINT_EVENT_INSTANCE(\n+\tlibcamera,\n+\trequest,\n+\trequest_reuse,\n+\tTP_ARGS(\n+\t\tuint64_t, cookie,\n+\t\tint, status,\n+\t\tint, cancelled\n+\t)\n+)\n+\n+TRACEPOINT_EVENT_INSTANCE(\n+\tlibcamera,\n+\trequest,\n+\trequest_add_buffer,\n+\tTP_ARGS(\n+\t\tuint64_t, cookie,\n+\t\tint, status,\n+\t\tint, cancelled\n+\t)\n+)\n+\n+TRACEPOINT_EVENT_INSTANCE(\n+\tlibcamera,\n+\trequest,\n+\trequest_find_buffer,\n+\tTP_ARGS(\n+\t\tuint64_t, cookie,\n+\t\tint, status,\n+\t\tint, cancelle\n+\t)\n+)\n+\n+TRACEPOINT_EVENT_INSTANCE(\n+\tlibcamera,\n+\trequest,\n+\trequest_complete,\n+\tTP_ARGS(\n+\t\tuint64_t, cookie,\n+\t\tint, status,\n+\t\tint, cancelled\n+\t)\n+)\n+\n+TRACEPOINT_EVENT_INSTANCE(\n+\tlibcamera,\n+\trequest,\n+\trequest_complete_buffer,\n+\tTP_ARGS(\n+\t\tuint64_t, cookie,\n+\t\tint, status,\n+\t\tint, cancelled\n+\t)\n+)\ndiff --git a/include/libcamera/internal/tracepoints/uvcvideo.tp b/include/libcamera/internal/tracepoints/uvcvideo.tp\nnew file mode 100644\nindex 00000000..61592ce5\n--- /dev/null\n+++ b/include/libcamera/internal/tracepoints/uvcvideo.tp\n@@ -0,0 +1,13 @@\n+TRACEPOINT_EVENT_CLASS(\n+\tlibcamera,\n+\tuvcvideo,\n+\tTP_ARGS(),\n+\tTP_FIELDS()\n+)\n+\n+TRACEPOINT_EVENT_INSTANCE(\n+\tlibcamera,\n+\tuvcvideo,\n+\tuvcvideo_contruct,\n+\tTP_ARGS()\n+)\ndiff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex 8ec0dac1..bc01a78c 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -27,6 +27,8 @@\n #include \"libcamera/internal/v4l2_controls.h\"\n #include \"libcamera/internal/v4l2_videodevice.h\"\n \n+#include \"libcamera/internal/tracepoints.h\"\n+\n namespace libcamera {\n \n LOG_DEFINE_CATEGORY(UVC)\n@@ -171,6 +173,7 @@ CameraConfiguration::Status UVCCameraConfiguration::validate()\n PipelineHandlerUVC::PipelineHandlerUVC(CameraManager *manager)\n \t: PipelineHandler(manager)\n {\n+\tLIBCAMERA_TRACEPOINT(uvcvideo_contruct);\n }\n \n CameraConfiguration *PipelineHandlerUVC::generateConfiguration(Camera *camera,\ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex ae8b1660..74c1a7b0 100644\n--- a/src/libcamera/request.cpp\n+++ b/src/libcamera/request.cpp\n@@ -17,6 +17,8 @@\n #include \"libcamera/internal/camera_controls.h\"\n #include \"libcamera/internal/log.h\"\n \n+#include \"libcamera/internal/tracepoints.h\"\n+\n /**\n * \\file request.h\n * \\brief Describes a frame capture request to be processed by a camera\n@@ -85,10 +87,14 @@ Request::Request(Camera *camera, uint64_t cookie)\n \t * \\todo: Add a validator for metadata controls.\n \t */\n \tmetadata_ = new ControlList(controls::controls);\n+\n+\tLIBCAMERA_TRACEPOINT(request_construct, cookie_, status_, cancelled_);\n }\n \n Request::~Request()\n {\n+\tLIBCAMERA_TRACEPOINT(request_deconstruct, cookie_, status_, cancelled_);\n+\n \tdelete metadata_;\n \tdelete controls_;\n \tdelete validator_;\n@@ -106,6 +112,8 @@ Request::~Request()\n */\n void Request::reuse(ReuseFlag flags)\n {\n+\tLIBCAMERA_TRACEPOINT(request_reuse, cookie_, status_, cancelled_);\n+\n \tpending_.clear();\n \tif (flags & ReuseBuffers) {\n \t\tfor (auto pair : bufferMap_) {\n@@ -167,6 +175,8 @@ void Request::reuse(ReuseFlag flags)\n */\n int Request::addBuffer(const Stream *stream, FrameBuffer *buffer)\n {\n+\tLIBCAMERA_TRACEPOINT(request_add_buffer, cookie_, status_, cancelled_);\n+\n \tif (!stream) {\n \t\tLOG(Request, Error) << \"Invalid stream reference\";\n \t\treturn -EINVAL;\n@@ -202,6 +212,8 @@ int Request::addBuffer(const Stream *stream, FrameBuffer *buffer)\n */\n FrameBuffer *Request::findBuffer(const Stream *stream) const\n {\n+\tLIBCAMERA_TRACEPOINT(request_find_buffer, cookie_, status_, cancelled_);\n+\n \tconst auto it = bufferMap_.find(stream);\n \tif (it == bufferMap_.end())\n \t\treturn nullptr;\n@@ -253,6 +265,8 @@ FrameBuffer *Request::findBuffer(const Stream *stream) const\n */\n void Request::complete()\n {\n+\tLIBCAMERA_TRACEPOINT(request_complete, cookie_, status_, cancelled_);\n+\n \tASSERT(!hasPendingBuffers());\n \tstatus_ = cancelled_ ? RequestCancelled : RequestComplete;\n \n@@ -276,6 +290,8 @@ void Request::complete()\n */\n bool Request::completeBuffer(FrameBuffer *buffer)\n {\n+\tLIBCAMERA_TRACEPOINT(request_complete_buffer, cookie_, status_, cancelled_);\n+\n \tint ret = pending_.erase(buffer);\n \tASSERT(ret == 1);\n \n","prefixes":["libcamera-devel","RFC","2/2","DO","NOT","MERGE"]}