projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
file-desrcriptor: add assignment operator
[lttng-tools.git]
/
src
/
common
/
file-descriptor.hpp
diff --git
a/src/common/file-descriptor.hpp
b/src/common/file-descriptor.hpp
index 8d6b64be4f51772fbb50692ca0577330294c7c2f..0ddc2b91c8f30a8d689a5be1b9fe26b8b0b412b9 100644
(file)
--- a/
src/common/file-descriptor.hpp
+++ b/
src/common/file-descriptor.hpp
@@
-20,14
+20,23
@@
namespace lttng {
*/
class file_descriptor {
public:
*/
class file_descriptor {
public:
- explicit file_descriptor(int raw_fd) noexcept : _raw_fd{raw_fd}
+ file_descriptor()
+ {
+ }
+
+ explicit file_descriptor(int raw_fd) noexcept : _raw_fd{ raw_fd }
{
LTTNG_ASSERT(_is_valid_fd(_raw_fd));
}
file_descriptor(const file_descriptor&) = delete;
file_descriptor& operator=(const file_descriptor&) = delete;
{
LTTNG_ASSERT(_is_valid_fd(_raw_fd));
}
file_descriptor(const file_descriptor&) = delete;
file_descriptor& operator=(const file_descriptor&) = delete;
- file_descriptor& operator=(file_descriptor&&) = delete;
+ file_descriptor& operator=(file_descriptor&& other)
+ {
+ _cleanup();
+ std::swap(_raw_fd, other._raw_fd);
+ return *this;
+ }
file_descriptor(file_descriptor&& other) noexcept
{
file_descriptor(file_descriptor&& other) noexcept
{
@@
-36,14
+45,7
@@
public:
~file_descriptor()
{
~file_descriptor()
{
- if (!_is_valid_fd(_raw_fd)) {
- return;
- }
-
- const auto ret = ::close(_raw_fd);
- if (ret) {
- PERROR("Failed to close file descriptor: fd=%i", _raw_fd);
- }
+ _cleanup();
}
int fd() const noexcept
}
int fd() const noexcept
@@
-58,6
+60,20
@@
private:
return fd >= 0;
}
return fd >= 0;
}
+ void _cleanup()
+ {
+ if (!_is_valid_fd(_raw_fd)) {
+ return;
+ }
+
+ const auto ret = ::close(_raw_fd);
+
+ _raw_fd = -1;
+ if (ret) {
+ PERROR("Failed to close file descriptor: fd=%i", _raw_fd);
+ }
+ }
+
int _raw_fd = -1;
};
int _raw_fd = -1;
};
This page took
0.024335 seconds
and
4
git commands to generate.