From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed] libstdc++: Simplify resource management in directory iterators
Date: Tue, 8 Feb 2022 21:04:47 +0000 [thread overview]
Message-ID: <20220208210447.3104779-1-jwakely@redhat.com> (raw)
Tested powerpc64le-linux, pushed to trunk.
This replaces the _Dir constructor that takes ownership of an existing
DIR* resource with one that takes a _Dir_base rvalue instead. This means
a raw DIR* is never passed around, but is always owned by a _Dir_base
object.
libstdc++-v3/ChangeLog:
* src/c++17/fs_dir.cc (_Dir(DIR*, const path&)): Change first
parameter to _Dir_base&&.
* src/filesystem/dir-common.h (_Dir_base(DIR*)): Remove.
* src/filesystem/dir.cc (_Dir(DIR*, const path&)): Change first
parameter to _Dir_base&&.
---
libstdc++-v3/src/c++17/fs_dir.cc | 4 ++--
libstdc++-v3/src/filesystem/dir-common.h | 2 --
libstdc++-v3/src/filesystem/dir.cc | 4 ++--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/libstdc++-v3/src/c++17/fs_dir.cc b/libstdc++-v3/src/c++17/fs_dir.cc
index 54f135d2baf..c67fe76bc14 100644
--- a/libstdc++-v3/src/c++17/fs_dir.cc
+++ b/libstdc++-v3/src/c++17/fs_dir.cc
@@ -57,7 +57,7 @@ struct fs::_Dir : _Dir_base
path = p;
}
- _Dir(posix::DIR* dirp, const path& p) : _Dir_base(dirp), path(p) { }
+ _Dir(_Dir_base&& d, const path& p) : _Dir_base(std::move(d)), path(p) { }
_Dir(_Dir&&) = default;
@@ -140,7 +140,7 @@ struct fs::_Dir : _Dir_base
_Dir_base d(dirfd, pathname, skip_permission_denied, nofollow, ec);
// If this->path is empty, the new _Dir should have an empty path too.
const fs::path& p = this->path.empty() ? this->path : this->entry.path();
- return _Dir(std::exchange(d.dirp, nullptr), p);
+ return _Dir(std::move(d), p);
}
bool
diff --git a/libstdc++-v3/src/filesystem/dir-common.h b/libstdc++-v3/src/filesystem/dir-common.h
index 0b7665a3f70..511b988f1c7 100644
--- a/libstdc++-v3/src/filesystem/dir-common.h
+++ b/libstdc++-v3/src/filesystem/dir-common.h
@@ -89,8 +89,6 @@ is_permission_denied_error(int e)
struct _Dir_base
{
- _Dir_base(posix::DIR* dirp = nullptr) : dirp(dirp) { }
-
// If no error occurs then dirp is non-null,
// otherwise null (even if a permission denied error is ignored).
_Dir_base(int fd, const posix::char_type* pathname,
diff --git a/libstdc++-v3/src/filesystem/dir.cc b/libstdc++-v3/src/filesystem/dir.cc
index e838b4bc6bf..b451902c4a1 100644
--- a/libstdc++-v3/src/filesystem/dir.cc
+++ b/libstdc++-v3/src/filesystem/dir.cc
@@ -59,7 +59,7 @@ struct fs::_Dir : std::filesystem::_Dir_base
path = p;
}
- _Dir(posix::DIR* dirp, const path& p) : _Dir_base(dirp), path(p) { }
+ _Dir(_Dir_base&& d, const path& p) : _Dir_base(std::move(d)), path(p) { }
_Dir(_Dir&&) = default;
@@ -133,7 +133,7 @@ struct fs::_Dir : std::filesystem::_Dir_base
{
auto [dirfd, pathname] = dir_and_pathname();
_Dir_base d(dirfd, pathname, skip_permission_denied, nofollow, ec);
- return _Dir(std::exchange(d.dirp, nullptr), entry.path());
+ return _Dir(std::move(d), entry.path());
}
fs::path path;
--
2.34.1
reply other threads:[~2022-02-08 21:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220208210447.3104779-1-jwakely@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).