Patch Detail
Show a patch.
GET /api/1.1/patches/17583/?format=api
{ "id": 17583, "url": "https://patchwork.libcamera.org/api/1.1/patches/17583/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17583/", "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": "<20221011105859.457567-6-paul.elder@ideasonboard.com>", "date": "2022-10-11T10:58:55", "name": "[libcamera-devel,v5,5/9] test: generated_serializer: Test Flags that is struct member", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "6f278f62afee452b073e0f190149e8f575694515", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17583/mbox/", "series": [ { "id": 3551, "url": "https://patchwork.libcamera.org/api/1.1/series/3551/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3551", "date": "2022-10-11T10:58:50", "name": "utils: ipc: Add support for enums and Flags", "version": 5, "mbox": "https://patchwork.libcamera.org/series/3551/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17583/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17583/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 B2429C0DA4\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 11 Oct 2022 10:59:24 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 620EE62D85;\n\tTue, 11 Oct 2022 12:59:24 +0200 (CEST)", "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 F247262D4E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 11 Oct 2022 12:59:22 +0200 (CEST)", "from pyrite.rasen.tech (h175-177-042-159.catv02.itscom.jp\n\t[175.177.42.159])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 523A0143F;\n\tTue, 11 Oct 2022 12:59:21 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1665485964;\n\tbh=FQZp1R7GCguTvhcd4r9Ol4LNyOwEN4K5u13hidwZOMI=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=yLuU8+OUIwEkJoaPhTpkIwxm+mn0qlGN+r6HrDOOkaV8HW+JzJVZJ0RgfohTfOM8z\n\ttwXbFCktb36fcomNxC9A6jj88jTYOEF2dpOCor0iOyYemKzVebT98ucjCLHFBqoU7X\n\tMe3XvrAr0MSY5g7SlQ2EIY61JWR93wOdcqOgSts09kV9GxBUKPZ2F9qk51DarVEuLc\n\tj/3TSoo5HhZ7ymNtEC9fOXzdsRKFVKlppfCQ8NPSSzmsc3rjMOQZUB74KNpcbXHgwK\n\t9cRSMWrtuhs/JAS2pK7f2A2nPlkVYMhO5/DywuoP9GqZ/VutVMTLgzZBaz3BlOinpL\n\tWJBfurpjLsgpw==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1665485962;\n\tbh=FQZp1R7GCguTvhcd4r9Ol4LNyOwEN4K5u13hidwZOMI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=aCl2RTMkX1CH9LjYlHLO1VYjkSbz4Inv6FPeDwzZtXbdkLysepvBthjLa77tjFQd9\n\t50i2Rx7pBfNq37sTg5EzGpt4GeFd4N+rpu4Ah+OPPG6Cmn35v0NY/6pB7i72e38ZKb\n\tiTZ7tzmsT1Cu56gN77auYbJgGW9EmNZzDJ8YCIlg=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"aCl2RTMk\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 11 Oct 2022 19:58:55 +0900", "Message-Id": "<20221011105859.457567-6-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20221011105859.457567-1-paul.elder@ideasonboard.com>", "References": "<20221011105859.457567-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v5 5/9] test: generated_serializer: Test\n\tFlags that is struct member", "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>", "From": "Paul Elder via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Paul Elder <paul.elder@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add fields to the test struct to test serialization/deserialization of\nscoped enums and flags that are struct members.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n---\nChanges in v5:\n- Add scoped enum to the test (basically the enum that the flag is\n created from)\n - This caught something that I missed in v4, which is why there is a\n v5 instead of just being merged...\n- Add a TEST_SCOPED_ENUM_EQUALITY macro\n\nNo change in v4\n\nChanges in v3:\n- add [scopedEnum] to enum ErrorFlags\n- s/[Flags]/[flags]/\n\nChanges in v2:\n- use new attribute-based mojom definition for Flags\n---\n .../generated_serializer_test.cpp | 21 +++++++++++++++++++\n .../include/libcamera/ipa/test.mojom | 9 ++++++++\n 2 files changed, 30 insertions(+)", "diff": "diff --git a/test/serialization/generated_serializer/generated_serializer_test.cpp b/test/serialization/generated_serializer/generated_serializer_test.cpp\nindex a4639a80..4670fe46 100644\n--- a/test/serialization/generated_serializer/generated_serializer_test.cpp\n+++ b/test/serialization/generated_serializer/generated_serializer_test.cpp\n@@ -35,6 +35,13 @@ if (struct1.field != struct2.field) {\t\t\t\t\\\n \treturn TestFail;\t\t\t\t\t\\\n }\n \n+#define TEST_SCOPED_ENUM_EQUALITY(struct1, struct2, field)\t\\\n+if (struct1.field != struct2.field) {\t\t\t\t\\\n+\tcerr << #field << \" field incorrect\" << endl;\t\t\\\n+\treturn TestFail;\t\t\t\t\t\\\n+}\n+\n+\n \t\tipa::test::TestStruct t, u;\n \n \t\tt.m = {\n@@ -52,6 +59,12 @@ if (struct1.field != struct2.field) {\t\t\t\t\\\n \t\tt.s3 = \"lorem ipsum\";\n \t\tt.i = 58527;\n \t\tt.c = ipa::test::IPAOperationInit;\n+\t\tt.e = ipa::test::ErrorFlags::Error1;\n+\n+\t\tFlags<ipa::test::ErrorFlags> flags;\n+\t\tflags |= ipa::test::ErrorFlags::Error1;\n+\t\tflags |= ipa::test::ErrorFlags::Error2;\n+\t\tt.f = flags;\n \n \t\tstd::vector<uint8_t> serialized;\n \n@@ -72,6 +85,8 @@ if (struct1.field != struct2.field) {\t\t\t\t\\\n \t\tTEST_FIELD_EQUALITY(t, u, i);\n \t\tTEST_FIELD_EQUALITY(t, u, c);\n \n+\t\tTEST_SCOPED_ENUM_EQUALITY(t, u, e);\n+\t\tTEST_SCOPED_ENUM_EQUALITY(t, u, f);\n \n \t\t/* Test vector of generated structs */\n \t\tstd::vector<ipa::test::TestStruct> v = { t, u };\n@@ -96,12 +111,18 @@ if (struct1.field != struct2.field) {\t\t\t\t\\\n \t\tTEST_FIELD_EQUALITY(v[0], w[0], i);\n \t\tTEST_FIELD_EQUALITY(v[0], w[0], c);\n \n+\t\tTEST_SCOPED_ENUM_EQUALITY(v[0], w[0], e);\n+\t\tTEST_SCOPED_ENUM_EQUALITY(v[0], w[0], f);\n+\n \t\tTEST_FIELD_EQUALITY(v[1], w[1], s1);\n \t\tTEST_FIELD_EQUALITY(v[1], w[1], s2);\n \t\tTEST_FIELD_EQUALITY(v[1], w[1], s3);\n \t\tTEST_FIELD_EQUALITY(v[1], w[1], i);\n \t\tTEST_FIELD_EQUALITY(v[1], w[1], c);\n \n+\t\tTEST_SCOPED_ENUM_EQUALITY(v[1], w[1], e);\n+\t\tTEST_SCOPED_ENUM_EQUALITY(v[1], w[1], f);\n+\n \t\treturn TestPass;\n \t}\n \ndiff --git a/test/serialization/generated_serializer/include/libcamera/ipa/test.mojom b/test/serialization/generated_serializer/include/libcamera/ipa/test.mojom\nindex 73081b40..91c31642 100644\n--- a/test/serialization/generated_serializer/include/libcamera/ipa/test.mojom\n+++ b/test/serialization/generated_serializer/include/libcamera/ipa/test.mojom\n@@ -9,6 +9,13 @@ enum IPAOperationCode {\n \tIPAOperationStop,\n };\n \n+[scopedEnum] enum ErrorFlags {\n+\tError1 = 0x1,\n+\tError2 = 0x2,\n+\tError3 = 0x4,\n+\tError4 = 0x8,\n+};\n+\n struct IPASettings {};\n \n struct TestStruct {\n@@ -19,6 +26,8 @@ struct TestStruct {\n \tint32 i;\n \tstring s3;\n \tIPAOperationCode c;\n+\tErrorFlags e;\n+\t[flags] ErrorFlags f;\n };\n \n interface IPATestInterface {\n", "prefixes": [ "libcamera-devel", "v5", "5/9" ] }