{"id":8994,"url":"https://patchwork.libcamera.org/api/1.1/patches/8994/?format=json","web_url":"https://patchwork.libcamera.org/patch/8994/","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":"<20200724231909.29464-1-laurent.pinchart@ideasonboard.com>","date":"2020-07-24T23:19:09","name":"[libcamera-devel,3/2] libcamera: file: Use Flags<> class for map flags","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"59f9a836d074e0c4136632f2a01f9d2573cf9e35","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":{"id":14,"url":"https://patchwork.libcamera.org/api/1.1/users/14/?format=json","username":"pinchartl","first_name":"Laurent","last_name":"Pinchart","email":"laurent.pinchart@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/8994/mbox/","series":[{"id":1143,"url":"https://patchwork.libcamera.org/api/1.1/series/1143/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1143","date":"2020-07-24T23:08:39","name":"libcamera: Add type-safe enum-based flags","version":1,"mbox":"https://patchwork.libcamera.org/series/1143/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8994/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8994/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 7BC7CBD86F\n\tfor ;\n\tFri, 24 Jul 2020 23:19:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 116F860939;\n\tSat, 25 Jul 2020 01:19:21 +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 CCE1D60496\n\tfor ;\n\tSat, 25 Jul 2020 01:19:19 +0200 (CEST)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 51962538\n\tfor ;\n\tSat, 25 Jul 2020 01:19:19 +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=\"H5MnhD3o\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1595632759;\n\tbh=TKd4BCQpVqK33IeminMp/uHBN9kC7Pqozk0NKG93Hl8=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=H5MnhD3oIrhDxVhhhuCH8kbEg5woxsR35nlMzmutEY1ex1Ys9wI+9nJzsmsOO6Zav\n\tw1Vkh+OzTn7s1SVNVeYdv+/xfPgOjx4u2uukljM94+wwP1Q3wJSdtxaOPAc/PFxl4B\n\tavVQZ02HTChi9Bhviy3H277UAktLWGbkYKEsyALY=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 25 Jul 2020 02:19:09 +0300","Message-Id":"<20200724231909.29464-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200724230841.27838-1-laurent.pinchart@ideasonboard.com>","References":"<20200724230841.27838-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 3/2] libcamera: file: Use Flags<> class\n\tfor map flags","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":"Use the newly introduced Flags<> class to store a bitfield of\nFile::MapFlag in a type-safe way.\n\nSigned-off-by: Laurent Pinchart \n---\n include/libcamera/internal/file.h | 9 +++++++--\n src/libcamera/file.cpp | 11 ++++++++---\n src/libcamera/ipa_module.cpp | 2 +-\n test/file.cpp | 2 +-\n 4 files changed, 17 insertions(+), 7 deletions(-)","diff":"diff --git a/include/libcamera/internal/file.h b/include/libcamera/internal/file.h\nindex 9b6d011f5e9d..d6baacaaa551 100644\n--- a/include/libcamera/internal/file.h\n+++ b/include/libcamera/internal/file.h\n@@ -11,6 +11,7 @@\n #include \n #include \n \n+#include \n #include \n \n namespace libcamera {\n@@ -18,11 +19,13 @@ namespace libcamera {\n class File\n {\n public:\n-\tenum MapFlag {\n+\tenum class MapFlag {\n \t\tMapNoOption = 0,\n \t\tMapPrivate = (1 << 0),\n \t};\n \n+\tusing MapFlags = Flags;\n+\n \tenum OpenMode {\n \t\tNotOpen = 0,\n \t\tReadOnly = (1 << 0),\n@@ -56,7 +59,7 @@ public:\n \tssize_t write(const Span &data);\n \n \tSpan map(off_t offset = 0, ssize_t size = -1,\n-\t\t\t MapFlag flags = MapNoOption);\n+\t\t\t MapFlags flags = MapFlag::MapNoOption);\n \tbool unmap(uint8_t *addr);\n \n \tstatic bool exists(const std::string &name);\n@@ -72,6 +75,8 @@ private:\n \tstd::map maps_;\n };\n \n+LIBCAMERA_FLAGS_ENABLE_OPERATORS(File::MapFlag)\n+\n } /* namespace libcamera */\n \n #endif /* __LIBCAMERA_INTERNAL_FILE_H__ */\ndiff --git a/src/libcamera/file.cpp b/src/libcamera/file.cpp\nindex 04b0cb61a1bf..de944deb8667 100644\n--- a/src/libcamera/file.cpp\n+++ b/src/libcamera/file.cpp\n@@ -52,6 +52,11 @@ LOG_DEFINE_CATEGORY(File);\n * the file constents\n */\n \n+/**\n+ * \\typedef File::MapFlags\n+ * \\brief An OR combination of File::MapFlag values\n+ */\n+\n /**\n * \\enum File::OpenMode\n * \\brief Mode in which a file is opened\n@@ -371,7 +376,7 @@ ssize_t File::write(const Span &data)\n *\n * \\return The mapped memory on success, or an empty span otherwise\n */\n-Span File::map(off_t offset, ssize_t size, enum File::MapFlag flags)\n+Span File::map(off_t offset, ssize_t size, File::MapFlags flags)\n {\n \tif (!isOpen()) {\n \t\terror_ = -EBADF;\n@@ -388,14 +393,14 @@ Span File::map(off_t offset, ssize_t size, enum File::MapFlag flags)\n \t\tsize -= offset;\n \t}\n \n-\tint mmapFlags = flags & MapPrivate ? MAP_PRIVATE : MAP_SHARED;\n+\tint mmapFlags = flags & MapFlag::MapPrivate ? MAP_PRIVATE : MAP_SHARED;\n \n \tint prot = 0;\n \tif (mode_ & ReadOnly)\n \t\tprot |= PROT_READ;\n \tif (mode_ & WriteOnly)\n \t\tprot |= PROT_WRITE;\n-\tif (flags & MapPrivate)\n+\tif (flags & MapFlag::MapPrivate)\n \t\tprot |= PROT_WRITE;\n \n \tvoid *map = mmap(NULL, size, prot, mmapFlags, fd_, offset);\ndiff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp\nindex de512a7f3a0d..c1eaf0bbb792 100644\n--- a/src/libcamera/ipa_module.cpp\n+++ b/src/libcamera/ipa_module.cpp\n@@ -323,7 +323,7 @@ int IPAModule::loadIPAModuleInfo()\n \t\treturn 0;\n \t}\n \n-\tdata = sign.map(0, -1, File::MapPrivate);\n+\tdata = sign.map(0, -1, File::MapFlag::MapPrivate);\n \tsignature_.resize(data.size());\n \tmemcpy(signature_.data(), data.data(), data.size());\n \ndiff --git a/test/file.cpp b/test/file.cpp\nindex f458f355ccad..9ea83d5b2cc4 100644\n--- a/test/file.cpp\n+++ b/test/file.cpp\n@@ -313,7 +313,7 @@ protected:\n \t\tfile.setFileName(fileName_);\n \t\tfile.open(File::ReadWrite);\n \n-\t\tdata = file.map(0, -1, File::MapPrivate);\n+\t\tdata = file.map(0, -1, File::MapFlag::MapPrivate);\n \t\tif (data.empty()) {\n \t\t\tcerr << \"Private mapping failed\" << endl;\n \t\t\treturn TestFail;\n","prefixes":["libcamera-devel","3/2"]}