From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Kent Gibson <warthog618@gmail.com>,
Linus Walleij <linus.walleij@linaro.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Viresh Kumar <viresh.kumar@linaro.org>
Cc: linux-gpio@vger.kernel.org,
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Subject: [libgpiod][PATCH 07/16] bindings: cxx: allow to copy line_settings
Date: Fri, 13 Jan 2023 22:52:01 +0100 [thread overview]
Message-ID: <20230113215210.616812-8-brgl@bgdev.pl> (raw)
In-Reply-To: <20230113215210.616812-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Implement the copy operator for line_settings. We have a copy() method
for line settings in C API while in C++ it's useful to copy line_settings
returned in an std::map from line_config.get_line_settings().
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
bindings/cxx/gpiodcxx/line-settings.hpp | 13 ++++++-
bindings/cxx/internal.hpp | 2 +-
bindings/cxx/line-settings.cpp | 28 ++++++++++++++
bindings/cxx/tests/tests-line-settings.cpp | 43 ++++++++++++++++++++++
4 files changed, 83 insertions(+), 3 deletions(-)
diff --git a/bindings/cxx/gpiodcxx/line-settings.hpp b/bindings/cxx/gpiodcxx/line-settings.hpp
index c1477b1..c18dc52 100644
--- a/bindings/cxx/gpiodcxx/line-settings.hpp
+++ b/bindings/cxx/gpiodcxx/line-settings.hpp
@@ -38,7 +38,11 @@ public:
*/
line_settings();
- line_settings(const line_settings& other) = delete;
+ /**
+ * @brief Copy constructor.
+ * @param other Object to copy.
+ */
+ line_settings(const line_settings& other);
/**
* @brief Move constructor.
@@ -48,7 +52,12 @@ public:
~line_settings();
- line_settings& operator=(const line_settings& other) = delete;
+ /**
+ * @brief Copy assignment operator.
+ * @param other Object to copy.
+ * @return Reference to self.
+ */
+ line_settings& operator=(const line_settings& other);
/**
* @brief Move assignment operator.
diff --git a/bindings/cxx/internal.hpp b/bindings/cxx/internal.hpp
index d27aa22..6aceac1 100644
--- a/bindings/cxx/internal.hpp
+++ b/bindings/cxx/internal.hpp
@@ -120,7 +120,7 @@ struct info_event::impl
struct line_settings::impl
{
impl();
- impl(const impl& other) = delete;
+ impl(const impl& other);
impl(impl&& other) = delete;
impl& operator=(const impl& other) = delete;
impl& operator=(impl&& other) = delete;
diff --git a/bindings/cxx/line-settings.cpp b/bindings/cxx/line-settings.cpp
index 5ded953..32f21a3 100644
--- a/bindings/cxx/line-settings.cpp
+++ b/bindings/cxx/line-settings.cpp
@@ -86,6 +86,15 @@ line_settings_ptr make_line_settings()
return settings;
}
+line_settings_ptr copy_line_settings(const line_settings_ptr& ptr)
+{
+ line_settings_ptr settings(::gpiod_line_settings_copy(ptr.get()));
+ if (!settings)
+ throw_from_errno("Unable to copy the line settings object");
+
+ return settings;
+}
+
template<class key_type, class value_type, class exception_type>
value_type map_setting(const key_type& key, const ::std::map<key_type, value_type>& mapping)
{
@@ -136,12 +145,24 @@ line_settings::impl::impl()
}
+line_settings::impl::impl(const impl& other)
+ : settings(copy_line_settings(other.settings))
+{
+
+}
+
GPIOD_CXX_API line_settings::line_settings()
: _m_priv(new impl)
{
}
+GPIOD_CXX_API line_settings::line_settings(const line_settings& other)
+ : _m_priv(new impl(*other._m_priv))
+{
+
+}
+
GPIOD_CXX_API line_settings::line_settings(line_settings&& other) noexcept
: _m_priv(::std::move(other._m_priv))
{
@@ -153,6 +174,13 @@ GPIOD_CXX_API line_settings::~line_settings()
}
+GPIOD_CXX_API line_settings& line_settings::operator=(const line_settings& other)
+{
+ this->_m_priv.reset(new impl(*other._m_priv));
+
+ return *this;
+}
+
GPIOD_CXX_API line_settings& line_settings::operator=(line_settings&& other)
{
this->_m_priv = ::std::move(other._m_priv);
diff --git a/bindings/cxx/tests/tests-line-settings.cpp b/bindings/cxx/tests/tests-line-settings.cpp
index a3f4bc5..dc821bb 100644
--- a/bindings/cxx/tests/tests-line-settings.cpp
+++ b/bindings/cxx/tests/tests-line-settings.cpp
@@ -124,6 +124,49 @@ TEST_CASE("line_settings mutators work", "[line-settings]")
}
}
+TEST_CASE("line_settings can be moved and copied", "[line-settings]")
+{
+ ::gpiod::line_settings settings;
+
+ settings
+ .set_direction(direction::INPUT)
+ .set_edge_detection(edge::BOTH);
+
+ SECTION("copy constructor works")
+ {
+ auto copy(settings);
+ settings.set_direction(direction::OUTPUT);
+ settings.set_edge_detection(edge::NONE);
+ REQUIRE(copy.direction() == direction::INPUT);
+ REQUIRE(copy.edge_detection() == edge::BOTH);
+ }
+
+ SECTION("assignment operator works")
+ {
+ ::gpiod::line_settings copy;
+ copy = settings;
+ settings.set_direction(direction::OUTPUT);
+ settings.set_edge_detection(edge::NONE);
+ REQUIRE(copy.direction() == direction::INPUT);
+ REQUIRE(copy.edge_detection() == edge::BOTH);
+ }
+
+ SECTION("move constructor works")
+ {
+ auto copy(::std::move(settings));
+ REQUIRE(copy.direction() == direction::INPUT);
+ REQUIRE(copy.edge_detection() == edge::BOTH);
+ }
+
+ SECTION("move assignment operator works")
+ {
+ ::gpiod::line_settings copy;
+ copy = ::std::move(settings);
+ REQUIRE(copy.direction() == direction::INPUT);
+ REQUIRE(copy.edge_detection() == edge::BOTH);
+ }
+}
+
TEST_CASE("line_settings stream insertion operator works", "[line-settings]")
{
::gpiod::line_settings settings;
--
2.37.2
next prev parent reply other threads:[~2023-01-13 21:52 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-13 21:51 [libgpiod][PATCH 00/16] treewide: continue beating libgpiod v2 into shape for an upcoming release Bartosz Golaszewski
2023-01-13 21:51 ` [libgpiod][PATCH 01/16] README: update for libgpiod v2 Bartosz Golaszewski
2023-01-14 11:14 ` Andy Shevchenko
2023-01-13 21:51 ` [libgpiod][PATCH 02/16] tests: avoid shadowing local variables with common names in macros Bartosz Golaszewski
2023-01-14 11:16 ` Andy Shevchenko
2023-01-13 21:51 ` [libgpiod][PATCH 03/16] build: unify the coding style of source files lists in Makefiles Bartosz Golaszewski
2023-01-13 21:51 ` [libgpiod][PATCH 04/16] treewide: unify gpiod_line_config/request_get_offsets() functions Bartosz Golaszewski
2023-01-16 0:14 ` Kent Gibson
2023-01-16 21:37 ` Bartosz Golaszewski
2023-01-16 23:39 ` Kent Gibson
2023-01-16 5:52 ` Viresh Kumar
2023-01-16 21:39 ` Bartosz Golaszewski
2023-01-17 5:44 ` Viresh Kumar
2023-01-18 20:51 ` Bartosz Golaszewski
2023-01-19 5:15 ` Viresh Kumar
2023-01-23 8:24 ` Viresh Kumar
2023-01-23 8:31 ` Bartosz Golaszewski
2023-01-23 13:58 ` Bartosz Golaszewski
2023-01-24 6:44 ` Viresh Kumar
2023-01-13 21:51 ` [libgpiod][PATCH 05/16] doc: update docs for libgpiod v2 Bartosz Golaszewski
2023-01-13 21:52 ` [libgpiod][PATCH 06/16] bindings: cxx: prepend all C symbols with the scope resolution operator Bartosz Golaszewski
2023-01-13 21:52 ` Bartosz Golaszewski [this message]
2023-01-13 21:52 ` [libgpiod][PATCH 08/16] tests: fix the line config reset test case Bartosz Golaszewski
2023-01-13 21:52 ` [libgpiod][PATCH 09/16] tests: add a helper for reading back line settings from line config Bartosz Golaszewski
2023-01-13 21:52 ` [libgpiod][PATCH 10/16] core: provide gpiod_line_config_set_output_values() Bartosz Golaszewski
2023-01-16 0:15 ` Kent Gibson
2023-01-16 22:23 ` Bartosz Golaszewski
2023-01-13 21:52 ` [libgpiod][PATCH 11/16] gpioset: use gpiod_line_config_set_output_values() Bartosz Golaszewski
2023-01-13 21:52 ` [libgpiod][PATCH 12/16] bindings: cxx: add line_config.set_output_values() Bartosz Golaszewski
2023-01-14 11:20 ` Andy Shevchenko
2023-01-13 21:52 ` [libgpiod][PATCH 13/16] bindings: python: provide line_config.set_output_values() Bartosz Golaszewski
2023-01-13 21:52 ` [libgpiod][PATCH 14/16] bindings: rust: make request_config optional in Chip.request_lines() Bartosz Golaszewski
2023-01-16 5:55 ` Viresh Kumar
2023-01-13 21:52 ` [libgpiod][PATCH 15/16] bindings: rust: make mutators return &mut self Bartosz Golaszewski
2023-01-16 6:02 ` Viresh Kumar
2023-01-16 8:42 ` Bartosz Golaszewski
2023-01-16 9:40 ` Viresh Kumar
2023-01-16 12:57 ` Bartosz Golaszewski
2023-01-17 5:19 ` Viresh Kumar
2023-01-13 21:52 ` [libgpiod][PATCH 16/16] bindings: rust: provide line_config.set_output_values() Bartosz Golaszewski
2023-01-16 6:09 ` Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230113215210.616812-8-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bartosz.golaszewski@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=viresh.kumar@linaro.org \
--cc=warthog618@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).