X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Ffile-descriptor.cpp;h=6f6a6be24dc6fdbfbcffab9f63633cb6e7314d1e;hb=b4853cf42d4edb25351a1c772961534ecae458c2;hp=9491a13af444bc7dbc9d1f372c43e8a5b3c84333;hpb=20c734f5b9940033f4ab96e47523c7d9e3d299bb;p=lttng-tools.git diff --git a/src/common/file-descriptor.cpp b/src/common/file-descriptor.cpp index 9491a13af..6f6a6be24 100644 --- a/src/common/file-descriptor.cpp +++ b/src/common/file-descriptor.cpp @@ -23,10 +23,6 @@ bool is_valid_fd(int fd) } } // anonymous namespace -lttng::file_descriptor::file_descriptor() noexcept -{ -} - lttng::file_descriptor::file_descriptor(int raw_fd) noexcept : _raw_fd{ raw_fd } { LTTNG_ASSERT(is_valid_fd(_raw_fd)); @@ -49,7 +45,7 @@ lttng::file_descriptor::~file_descriptor() noexcept _cleanup(); } -int lttng::file_descriptor::_fd() const noexcept +int lttng::file_descriptor::fd() const noexcept { LTTNG_ASSERT(is_valid_fd(_raw_fd)); return _raw_fd; @@ -87,9 +83,9 @@ void lttng::file_descriptor::write(const void *buffer, std::size_t size) max_supported_write_size)); } - const auto write_ret = lttng_write(_fd(), buffer, size); + const auto write_ret = lttng_write(fd(), buffer, size); if (write_ret < 0 || static_cast(write_ret) != size) { - LTTNG_THROW_POSIX(fmt::format("Failed to write to file descriptor: fd={}", _fd()), + LTTNG_THROW_POSIX(fmt::format("Failed to write to file descriptor: fd={}", fd()), errno); } } @@ -111,9 +107,9 @@ void lttng::file_descriptor::read(void *buffer, std::size_t size) max_supported_read_size)); } - const auto read_ret = lttng_read(_fd(), buffer, size); + const auto read_ret = lttng_read(fd(), buffer, size); if (read_ret < 0 || static_cast(read_ret) != size) { - LTTNG_THROW_POSIX(fmt::format("Failed to read from file descriptor: fd={}", _fd()), + LTTNG_THROW_POSIX(fmt::format("Failed to read from file descriptor: fd={}", fd()), errno); } }