From b2a331aa527bdd5f4d91727904cc5c66fe897d62 Mon Sep 17 00:00:00 2001 From: crupest Date: Mon, 24 Jun 2024 00:06:25 +0800 Subject: Done Stream refactor. NEED TEST: BufferStream, AutoReadStream, SubProcess. --- src/base/platform/unix/PosixSpawnSubProcess.cpp | 4 ++-- src/base/platform/unix/UnixFileStream.cpp | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'src/base/platform/unix') diff --git a/src/base/platform/unix/PosixSpawnSubProcess.cpp b/src/base/platform/unix/PosixSpawnSubProcess.cpp index 75d48cc2..5e09c494 100644 --- a/src/base/platform/unix/PosixSpawnSubProcess.cpp +++ b/src/base/platform/unix/PosixSpawnSubProcess.cpp @@ -28,9 +28,9 @@ PosixSpawnSubProcessImpl::PosixSpawnSubProcessImpl() stderr_pipe_.GetSelfFileDescriptor(), false, true, false, true); stdout_buffer_stream_ = - std::make_unique(stdout_stream_.get(), false); + std::make_unique(stdout_stream_.get(), true, false); stderr_buffer_stream_ = - std::make_unique(stderr_stream_.get(), false); + std::make_unique(stderr_stream_.get(), true, false); } PosixSpawnSubProcessImpl::~PosixSpawnSubProcessImpl() {} diff --git a/src/base/platform/unix/UnixFileStream.cpp b/src/base/platform/unix/UnixFileStream.cpp index c53bbbaa..6d8bab25 100644 --- a/src/base/platform/unix/UnixFileStream.cpp +++ b/src/base/platform/unix/UnixFileStream.cpp @@ -61,15 +61,7 @@ UnixFileStream::UnixFileStream(int fd, bool can_seek, bool can_read, auto_close_ = auto_close; } -UnixFileStream::~UnixFileStream() { - if (auto_close_ && file_descriptor_ >= 0) { - if (::close(file_descriptor_) == -1) { - // We are in destructor, so we can not throw. - CRU_LOG_WARN(u"Failed to close file descriptor {}, errno {}.", - file_descriptor_, errno); - } - } -} +UnixFileStream::~UnixFileStream() { DoClose(); } Index UnixFileStream::DoSeek(Index offset, SeekOrigin origin) { off_t result = ::lseek(file_descriptor_, offset, MapSeekOrigin(origin)); -- cgit v1.2.3