From 71c01a175a939d1a519ab235fdfdeec1101f8b84 Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 25 Jan 2022 17:48:53 +0800 Subject: ... --- include/cru/common/ErrnoException.hpp | 28 ----- include/cru/common/io/FileStream.hpp | 4 +- include/cru/common/io/UnixFileStream.hpp | 47 ------- .../cru/common/platform/unix/ErrnoException.hpp | 28 +++++ .../cru/common/platform/unix/UnixFileStream.hpp | 47 +++++++ src/common/CMakeLists.txt | 4 +- src/common/ErrnoException.cpp | 14 --- src/common/io/UnixFileStream.cpp | 134 -------------------- src/common/platform/unix/ErrnoException.cpp | 14 +++ src/common/platform/unix/UnixFileStream.cpp | 135 +++++++++++++++++++++ test/common/io/UnixFileStreamTest.cpp | 3 +- 11 files changed, 230 insertions(+), 228 deletions(-) delete mode 100644 include/cru/common/ErrnoException.hpp delete mode 100644 include/cru/common/io/UnixFileStream.hpp create mode 100644 include/cru/common/platform/unix/ErrnoException.hpp create mode 100644 include/cru/common/platform/unix/UnixFileStream.hpp delete mode 100644 src/common/ErrnoException.cpp delete mode 100644 src/common/io/UnixFileStream.cpp create mode 100644 src/common/platform/unix/ErrnoException.cpp create mode 100644 src/common/platform/unix/UnixFileStream.cpp diff --git a/include/cru/common/ErrnoException.hpp b/include/cru/common/ErrnoException.hpp deleted file mode 100644 index d1390cf2..00000000 --- a/include/cru/common/ErrnoException.hpp +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "PreConfig.hpp" - -#ifdef CRU_PLATFORM_UNIX - -#include "Exception.hpp" - -namespace cru { -class ErrnoException : public Exception { - public: - ErrnoException() : ErrnoException(String{}) {} - explicit ErrnoException(const String& message); - ErrnoException(const String& message, int errno_code); - - CRU_DELETE_COPY(ErrnoException) - CRU_DELETE_MOVE(ErrnoException) - - ~ErrnoException() override = default; - - int GetErrnoCode() const { return errno_code_; } - - private: - int errno_code_; -}; -} // namespace cru - -#endif diff --git a/include/cru/common/io/FileStream.hpp b/include/cru/common/io/FileStream.hpp index 73c7b61e..86c4c037 100644 --- a/include/cru/common/io/FileStream.hpp +++ b/include/cru/common/io/FileStream.hpp @@ -1,9 +1,9 @@ #pragma once #ifdef CRU_PLATFORM_UNIX -#include "UnixFileStream.hpp" +#include "../platform/unix/UnixFileStream.hpp" namespace cru::io { -using FileStream = UnixFileStream; +using FileStream = platform::unix::UnixFileStream; } #elif CRU_PLATFORM_WINDOWS #include "../platform/win/Win32FileStream.hpp" diff --git a/include/cru/common/io/UnixFileStream.hpp b/include/cru/common/io/UnixFileStream.hpp deleted file mode 100644 index 633b9bd1..00000000 --- a/include/cru/common/io/UnixFileStream.hpp +++ /dev/null @@ -1,47 +0,0 @@ -#pragma once - -#include "../PreConfig.hpp" - -#ifdef CRU_PLATFORM_UNIX - -#include "../String.hpp" -#include "OpenFileFlag.hpp" -#include "Stream.hpp" - -namespace cru::io { -class UnixFileStream : public Stream { - public: - UnixFileStream(String path, OpenFileFlag flags); - - CRU_DELETE_COPY(UnixFileStream) - CRU_DELETE_MOVE(UnixFileStream) - - ~UnixFileStream() override; - - public: - bool CanSeek() override; - Index Tell() override; - void Seek(Index offset, SeekOrigin origin = SeekOrigin::Current) override; - - bool CanRead() override; - Index Read(std::byte* buffer, Index offset, Index size) override; - using Stream::Read; - - bool CanWrite() override; - Index Write(const std::byte* buffer, Index offset, Index size) override; - using Stream::Write; - - void Close() override; - - private: - void CheckClosed(); - - private: - String path_; - OpenFileFlag flags_; - int file_descriptor_; - bool closed_ = false; -}; -} // namespace cru::io - -#endif diff --git a/include/cru/common/platform/unix/ErrnoException.hpp b/include/cru/common/platform/unix/ErrnoException.hpp new file mode 100644 index 00000000..2982e26a --- /dev/null +++ b/include/cru/common/platform/unix/ErrnoException.hpp @@ -0,0 +1,28 @@ +#pragma once + +#include "../../PreConfig.hpp" + +#ifdef CRU_PLATFORM_UNIX + +#include "../Exception.hpp" + +namespace cru::platform::unix { +class ErrnoException : public PlatformException { + public: + ErrnoException() : ErrnoException(String{}) {} + explicit ErrnoException(const String& message); + ErrnoException(const String& message, int errno_code); + + CRU_DELETE_COPY(ErrnoException) + CRU_DELETE_MOVE(ErrnoException) + + ~ErrnoException() override = default; + + int GetErrnoCode() const { return errno_code_; } + + private: + int errno_code_; +}; +} // namespace cru::platform::unix + +#endif diff --git a/include/cru/common/platform/unix/UnixFileStream.hpp b/include/cru/common/platform/unix/UnixFileStream.hpp new file mode 100644 index 00000000..618f7aa3 --- /dev/null +++ b/include/cru/common/platform/unix/UnixFileStream.hpp @@ -0,0 +1,47 @@ +#pragma once + +#include "../../PreConfig.hpp" + +#ifdef CRU_PLATFORM_UNIX + +#include "../../String.hpp" +#include "../../io/OpenFileFlag.hpp" +#include "../../io/Stream.hpp" + +namespace cru::platform::unix { +class UnixFileStream : public io::Stream { + public: + UnixFileStream(String path, io::OpenFileFlag flags); + + CRU_DELETE_COPY(UnixFileStream) + CRU_DELETE_MOVE(UnixFileStream) + + ~UnixFileStream() override; + + public: + bool CanSeek() override; + Index Tell() override; + void Seek(Index offset, SeekOrigin origin = SeekOrigin::Current) override; + + bool CanRead() override; + Index Read(std::byte* buffer, Index offset, Index size) override; + using Stream::Read; + + bool CanWrite() override; + Index Write(const std::byte* buffer, Index offset, Index size) override; + using Stream::Write; + + void Close() override; + + private: + void CheckClosed(); + + private: + String path_; + io::OpenFileFlag flags_; + int file_descriptor_; + bool closed_ = false; +}; +} // namespace cru::platform::unix + +#endif diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 481205a0..200ea7fa 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -17,8 +17,8 @@ target_compile_definitions(cru_base PUBLIC $<$:CRU_DEBUG>) if (UNIX) target_sources(cru_base PRIVATE - ErrnoException.cpp - io/UnixFileStream.cpp + platform/unix/ErrnoException.cpp + platform/unix/UnixFileStream.cpp ) endif() diff --git a/src/common/ErrnoException.cpp b/src/common/ErrnoException.cpp deleted file mode 100644 index 731ae3e5..00000000 --- a/src/common/ErrnoException.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "cru/common/ErrnoException.hpp" - -#include "cru/common/Format.hpp" - -#include - -namespace cru { -ErrnoException::ErrnoException(const String& message) - : ErrnoException(message, errno) {} - -ErrnoException::ErrnoException(const String& message, int errno_code) - : Exception(Format(u"{}. Errno is {}.", message, errno_code)), - errno_code_(errno_code) {} -} // namespace cru diff --git a/src/common/io/UnixFileStream.cpp b/src/common/io/UnixFileStream.cpp deleted file mode 100644 index 615c36f1..00000000 --- a/src/common/io/UnixFileStream.cpp +++ /dev/null @@ -1,134 +0,0 @@ -#include "cru/common/io/UnixFileStream.hpp" -#include "cru/common/ErrnoException.hpp" -#include "cru/common/io/OpenFileFlag.hpp" -#include "cru/common/Format.hpp" - -#include -#include -#include - -namespace cru::io { - -namespace { -int MapOpenFileFlag(OpenFileFlag flags) { - int result = 0; - if (flags & OpenFileFlags::Read) { - if (flags & OpenFileFlags::Write) { - result |= O_RDWR; - } else { - result |= O_RDONLY; - } - } else { - if (flags & OpenFileFlags::Write) { - result |= O_WRONLY; - } else { - throw Exception(u"Invalid open file flag."); - } - } - - if (flags & OpenFileFlags::Append) { - result |= O_APPEND; - } - - if (flags & OpenFileFlags::Create) { - result |= O_CREAT; - } - - if (flags & OpenFileFlags::ThrowOnExist) { - result |= O_EXCL; - } - - return result; -} - -int MapSeekOrigin(Stream::SeekOrigin origin) { - switch (origin) { - case Stream::SeekOrigin::Begin: - return SEEK_SET; - case Stream::SeekOrigin::Current: - return SEEK_CUR; - case Stream::SeekOrigin::End: - return SEEK_END; - default: - throw Exception(u"Invalid seek origin."); - } -} -} // namespace - -UnixFileStream::~UnixFileStream() { Close(); } - -UnixFileStream::UnixFileStream(String path, OpenFileFlag flags) - : path_(std::move(path)), flags_(flags) { - auto p = path_.ToUtf8(); - file_descriptor_ = - ::open(p.c_str(), MapOpenFileFlag(flags_), S_IRUSR | S_IWUSR); - if (file_descriptor_ == -1) { - throw ErrnoException( - Format(u"Failed to open file {} with flags {}.", path_, flags_.value)); - } -} - -bool UnixFileStream::CanSeek() { - CheckClosed(); - return true; -} - -Index UnixFileStream::Tell() { - CheckClosed(); - auto result = ::lseek(file_descriptor_, 0, SEEK_CUR); - if (result == -1) { - throw ErrnoException(u"Failed to get file position."); - } - return result; -} - -void UnixFileStream::Seek(Index offset, SeekOrigin origin) { - CheckClosed(); - int result = ::lseek(file_descriptor_, offset, MapSeekOrigin(origin)); - if (result == -1) { - throw ErrnoException(u"Failed to seek file."); - } -} - -bool UnixFileStream::CanRead() { - CheckClosed(); - return flags_ & OpenFileFlags::Read; -} - -Index UnixFileStream::Read(std::byte *buffer, Index offset, Index size) { - CheckClosed(); - auto result = ::read(file_descriptor_, buffer + offset, size); - if (result == -1) { - throw ErrnoException(u"Failed to read file."); - } - return result; -} - -bool UnixFileStream::CanWrite() { - CheckClosed(); - return flags_ & OpenFileFlags::Write; -} - -Index UnixFileStream::Write(const std::byte *buffer, Index offset, Index size) { - CheckClosed(); - auto result = ::write(file_descriptor_, buffer + offset, size); - if (result == -1) { - throw ErrnoException(u"Failed to write file."); - } - return result; -} - -void UnixFileStream::Close() { - if (closed_) return; - if (::close(file_descriptor_) == -1) { - throw ErrnoException(u"Failed to close file."); - } - closed_ = true; -} - -void UnixFileStream::CheckClosed() { - if (closed_) { - throw Exception(u"File is closed."); - } -} -} // namespace cru::io diff --git a/src/common/platform/unix/ErrnoException.cpp b/src/common/platform/unix/ErrnoException.cpp new file mode 100644 index 00000000..14e6a5a2 --- /dev/null +++ b/src/common/platform/unix/ErrnoException.cpp @@ -0,0 +1,14 @@ +#include "cru/common/platform/unix/ErrnoException.hpp" + +#include "cru/common/Format.hpp" + +#include + +namespace cru::platform::unix { +ErrnoException::ErrnoException(const String& message) + : ErrnoException(message, errno) {} + +ErrnoException::ErrnoException(const String& message, int errno_code) + : PlatformException(Format(u"{}. Errno is {}.", message, errno_code)), + errno_code_(errno_code) {} +} // namespace cru::platform::unix diff --git a/src/common/platform/unix/UnixFileStream.cpp b/src/common/platform/unix/UnixFileStream.cpp new file mode 100644 index 00000000..bb8d4207 --- /dev/null +++ b/src/common/platform/unix/UnixFileStream.cpp @@ -0,0 +1,135 @@ +#include "cru/common/platform/unix/UnixFileStream.hpp" +#include "cru/common/Format.hpp" +#include "cru/common/io/OpenFileFlag.hpp" +#include "cru/common/platform/unix/ErrnoException.hpp" + +#include +#include +#include + +namespace cru::platform::unix { +using namespace cru::io; + +namespace { +int MapOpenFileFlag(OpenFileFlag flags) { + int result = 0; + if (flags & OpenFileFlags::Read) { + if (flags & OpenFileFlags::Write) { + result |= O_RDWR; + } else { + result |= O_RDONLY; + } + } else { + if (flags & OpenFileFlags::Write) { + result |= O_WRONLY; + } else { + throw Exception(u"Invalid open file flag."); + } + } + + if (flags & OpenFileFlags::Append) { + result |= O_APPEND; + } + + if (flags & OpenFileFlags::Create) { + result |= O_CREAT; + } + + if (flags & OpenFileFlags::ThrowOnExist) { + result |= O_EXCL; + } + + return result; +} + +int MapSeekOrigin(Stream::SeekOrigin origin) { + switch (origin) { + case Stream::SeekOrigin::Begin: + return SEEK_SET; + case Stream::SeekOrigin::Current: + return SEEK_CUR; + case Stream::SeekOrigin::End: + return SEEK_END; + default: + throw Exception(u"Invalid seek origin."); + } +} +} // namespace + +UnixFileStream::~UnixFileStream() { Close(); } + +UnixFileStream::UnixFileStream(String path, OpenFileFlag flags) + : path_(std::move(path)), flags_(flags) { + auto p = path_.ToUtf8(); + file_descriptor_ = + ::open(p.c_str(), MapOpenFileFlag(flags_), S_IRUSR | S_IWUSR); + if (file_descriptor_ == -1) { + throw ErrnoException( + Format(u"Failed to open file {} with flags {}.", path_, flags_.value)); + } +} + +bool UnixFileStream::CanSeek() { + CheckClosed(); + return true; +} + +Index UnixFileStream::Tell() { + CheckClosed(); + auto result = ::lseek(file_descriptor_, 0, SEEK_CUR); + if (result == -1) { + throw ErrnoException(u"Failed to get file position."); + } + return result; +} + +void UnixFileStream::Seek(Index offset, SeekOrigin origin) { + CheckClosed(); + int result = ::lseek(file_descriptor_, offset, MapSeekOrigin(origin)); + if (result == -1) { + throw ErrnoException(u"Failed to seek file."); + } +} + +bool UnixFileStream::CanRead() { + CheckClosed(); + return flags_ & OpenFileFlags::Read; +} + +Index UnixFileStream::Read(std::byte *buffer, Index offset, Index size) { + CheckClosed(); + auto result = ::read(file_descriptor_, buffer + offset, size); + if (result == -1) { + throw ErrnoException(u"Failed to read file."); + } + return result; +} + +bool UnixFileStream::CanWrite() { + CheckClosed(); + return flags_ & OpenFileFlags::Write; +} + +Index UnixFileStream::Write(const std::byte *buffer, Index offset, Index size) { + CheckClosed(); + auto result = ::write(file_descriptor_, buffer + offset, size); + if (result == -1) { + throw ErrnoException(u"Failed to write file."); + } + return result; +} + +void UnixFileStream::Close() { + if (closed_) return; + if (::close(file_descriptor_) == -1) { + throw ErrnoException(u"Failed to close file."); + } + closed_ = true; +} + +void UnixFileStream::CheckClosed() { + if (closed_) { + throw Exception(u"File is closed."); + } +} +} // namespace cru::platform::unix diff --git a/test/common/io/UnixFileStreamTest.cpp b/test/common/io/UnixFileStreamTest.cpp index 1b73dd3b..cdc749ba 100644 --- a/test/common/io/UnixFileStreamTest.cpp +++ b/test/common/io/UnixFileStreamTest.cpp @@ -1,5 +1,5 @@ #include "cru/common/io/OpenFileFlag.hpp" -#include "cru/common/io/UnixFileStream.hpp" +#include "cru/common/platform/unix/UnixFileStream.hpp" #include @@ -9,6 +9,7 @@ TEST(UnixFileStream, Work) { using namespace cru; using namespace cru::io; + using namespace cru::platform::unix; auto temp_file_path = (std::filesystem::temp_directory_path() / "cru_test_temp.XXXXXX") -- cgit v1.2.3