{"id":10288,"url":"https://patchwork.libcamera.org/api/patches/10288/?format=json","web_url":"https://patchwork.libcamera.org/patch/10288/","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":"<20201028103151.34575-2-paul.elder@ideasonboard.com>","date":"2020-10-28T10:31:47","name":"[libcamera-devel,v2,2/6] libcamera: request: Add tracepoints","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"826385fbf1da5f5b23a35c309f327c2e3aad52fa","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10288/mbox/","series":[{"id":1428,"url":"https://patchwork.libcamera.org/api/series/1428/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1428","date":"2020-10-28T10:31:46","name":"[libcamera-devel,v2,1/6] libcamera: tracing: Implement tracing infrastructure","version":2,"mbox":"https://patchwork.libcamera.org/series/1428/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10288/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10288/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 1A112BDB1E\n\tfor ;\n\tWed, 28 Oct 2020 10:32:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C405D625FE;\n\tWed, 28 Oct 2020 11:32:05 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2B130625EF\n\tfor ;\n\tWed, 28 Oct 2020 11:32:04 +0100 (CET)","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 9FC3199A;\n\tWed, 28 Oct 2020 11:32:02 +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=\"BZW0CaZ2\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1603881123;\n\tbh=4r43Df56Lzm3dEGcbjXd7izkQmLPHXCdRVDpiAWMSDQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=BZW0CaZ2RU6elEUUpBbHpSxryaZQ+2y73Lzk5/lIRhp3pcAe69Q6pqcsLJxpQckje\n\tqNn9MJMJgoGEIQWqi/c5erbtjV4GXgzymqNMvJ9dGKKuGK5NpgV8uLo42eqimUisMH\n\t7YeQEHUfyrKoAjf7dpnyLfmiiqABThVMRFoipW9U=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 28 Oct 2020 19:31:47 +0900","Message-Id":"<20201028103151.34575-2-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20201028103151.34575-1-paul.elder@ideasonboard.com>","References":"<20201028103151.34575-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 2/6] libcamera: 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 Request.\n\nSigned-off-by: Paul Elder \n\n---\nChanges in v2:\n- remove tracepoints from uvcvideo\n- remove comment in changelog that this is only used for demonstration\n- use Request pointers instead of feeding the fields manually to the\n tracepoint\n---\n .../internal/tracepoints/meson.build | 1 +\n .../libcamera/internal/tracepoints/request.tp | 85 +++++++++++++++++++\n src/libcamera/request.cpp | 15 ++++\n 3 files changed, 101 insertions(+)\n create mode 100644 include/libcamera/internal/tracepoints/request.tp","diff":"diff --git a/include/libcamera/internal/tracepoints/meson.build b/include/libcamera/internal/tracepoints/meson.build\nindex 2dd6733e..8410c205 100644\n--- a/include/libcamera/internal/tracepoints/meson.build\n+++ b/include/libcamera/internal/tracepoints/meson.build\n@@ -1,4 +1,5 @@\n # SPDX-License-Identifier: CC0-1.0\n \n tracepoint_files = files([\n+ 'request.tp',\n ])\ndiff --git a/include/libcamera/internal/tracepoints/request.tp b/include/libcamera/internal/tracepoints/request.tp\nnew file mode 100644\nindex 00000000..481a3670\n--- /dev/null\n+++ b/include/libcamera/internal/tracepoints/request.tp\n@@ -0,0 +1,85 @@\n+#include \n+\n+TRACEPOINT_EVENT_CLASS(\n+\tlibcamera,\n+\trequest,\n+\tTP_ARGS(\n+\t\tlibcamera::Request *, req,\n+\t\tint, cancelled\n+\t),\n+\tTP_FIELDS(\n+\t\tctf_integer(uint64_t, cookie, req->cookie())\n+\t\tctf_integer(int, status, req->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\tlibcamera::Request *, req,\n+\t\tint, cancelled\n+\t)\n+)\n+\n+TRACEPOINT_EVENT_INSTANCE(\n+\tlibcamera,\n+\trequest,\n+\trequest_deconstruct,\n+\tTP_ARGS(\n+\t\tlibcamera::Request *, req,\n+\t\tint, cancelled\n+\t)\n+)\n+\n+TRACEPOINT_EVENT_INSTANCE(\n+\tlibcamera,\n+\trequest,\n+\trequest_reuse,\n+\tTP_ARGS(\n+\t\tlibcamera::Request *, req,\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\tlibcamera::Request *, req,\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\tconst libcamera::Request *, req,\n+\t\tint, cancelled\n+\t)\n+)\n+\n+TRACEPOINT_EVENT_INSTANCE(\n+\tlibcamera,\n+\trequest,\n+\trequest_complete,\n+\tTP_ARGS(\n+\t\tlibcamera::Request *, req,\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\tlibcamera::Request *, req,\n+\t\tint, cancelled\n+\t)\n+)\ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex ae8b1660..bec2cab5 100644\n--- a/src/libcamera/request.cpp\n+++ b/src/libcamera/request.cpp\n@@ -16,6 +16,7 @@\n \n #include \"libcamera/internal/camera_controls.h\"\n #include \"libcamera/internal/log.h\"\n+#include \"libcamera/internal/tracepoints.h\"\n \n /**\n * \\file request.h\n@@ -85,10 +86,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, this, cancelled_);\n }\n \n Request::~Request()\n {\n+\tLIBCAMERA_TRACEPOINT(request_deconstruct, this, cancelled_);\n+\n \tdelete metadata_;\n \tdelete controls_;\n \tdelete validator_;\n@@ -106,6 +111,8 @@ Request::~Request()\n */\n void Request::reuse(ReuseFlag flags)\n {\n+\tLIBCAMERA_TRACEPOINT(request_reuse, this, cancelled_);\n+\n \tpending_.clear();\n \tif (flags & ReuseBuffers) {\n \t\tfor (auto pair : bufferMap_) {\n@@ -167,6 +174,8 @@ void Request::reuse(ReuseFlag flags)\n */\n int Request::addBuffer(const Stream *stream, FrameBuffer *buffer)\n {\n+\tLIBCAMERA_TRACEPOINT(request_add_buffer, this, cancelled_);\n+\n \tif (!stream) {\n \t\tLOG(Request, Error) << \"Invalid stream reference\";\n \t\treturn -EINVAL;\n@@ -202,6 +211,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, this, cancelled_);\n+\n \tconst auto it = bufferMap_.find(stream);\n \tif (it == bufferMap_.end())\n \t\treturn nullptr;\n@@ -253,6 +264,8 @@ FrameBuffer *Request::findBuffer(const Stream *stream) const\n */\n void Request::complete()\n {\n+\tLIBCAMERA_TRACEPOINT(request_complete, this, cancelled_);\n+\n \tASSERT(!hasPendingBuffers());\n \tstatus_ = cancelled_ ? RequestCancelled : RequestComplete;\n \n@@ -276,6 +289,8 @@ void Request::complete()\n */\n bool Request::completeBuffer(FrameBuffer *buffer)\n {\n+\tLIBCAMERA_TRACEPOINT(request_complete_buffer, this, cancelled_);\n+\n \tint ret = pending_.erase(buffer);\n \tASSERT(ret == 1);\n \n","prefixes":["libcamera-devel","v2","2/6"]}