tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fd::stat returns Result<Stat> instead of Stat

Browse Source 
GitOrigin-RevId: 7bdb5f0d65df55424db302e4df060b697d8ee11d
This commit is contained in:
Arseny Smirnov 2019-06-19 16:31:25 +02:00
parent a569a1eac7
commit ff3164ff04
14 changed files with 61 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
td/telegram/SecureStorage.cpp
View File

@ -352,7 +352,7 @@ Result<BufferSlice> decrypt_value(const Secret &secret, const ValueHash &hash, S
Result<ValueHash> encrypt_file(const Secret &secret, std::string src, std::string dest) { Result<ValueHash> encrypt_file(const Secret &secret, std::string src, std::string dest) {
TRY_RESULT(src_file, FileFd::open(src, FileFd::Flags::Read)); TRY_RESULT(src_file, FileFd::open(src, FileFd::Flags::Read));
TRY_RESULT(dest_file, FileFd::open(dest, FileFd::Flags::Truncate | FileFd::Flags::Write | FileFd::Create)); TRY_RESULT(dest_file, FileFd::open(dest, FileFd::Flags::Truncate | FileFd::Flags::Write | FileFd::Create));
auto src_file_size = src_file.get_size(); TRY_RESULT(src_file_size, src_file.get_size());
BufferSliceDataView random_prefix_view(gen_random_prefix(src_file_size)); BufferSliceDataView random_prefix_view(gen_random_prefix(src_file_size));
FileDataView data_view(src_file, src_file_size); FileDataView data_view(src_file, src_file_size);
@ -370,7 +370,7 @@ Result<ValueHash> encrypt_file(const Secret &secret, std::string src, std::strin
Status decrypt_file(const Secret &secret, const ValueHash &hash, std::string src, std::string dest) { Status decrypt_file(const Secret &secret, const ValueHash &hash, std::string src, std::string dest) {
TRY_RESULT(src_file, FileFd::open(src, FileFd::Flags::Read)); TRY_RESULT(src_file, FileFd::open(src, FileFd::Flags::Read));
TRY_RESULT(dest_file, FileFd::open(dest, FileFd::Flags::Truncate | FileFd::Flags::Write | FileFd::Create)); TRY_RESULT(dest_file, FileFd::open(dest, FileFd::Flags::Truncate | FileFd::Flags::Write | FileFd::Create));
auto src_file_size = src_file.get_size(); TRY_RESULT(src_file_size, src_file.get_size());
FileDataView src_file_view(src_file, src_file_size); FileDataView src_file_view(src_file, src_file_size);

2
td/telegram/cli.cpp
View File

@ -3630,7 +3630,7 @@ class CliClient final : public Actor {
} }
auto fd = r_fd.move_as_ok(); auto fd = r_fd.move_as_ok();
auto size = fd.get_size(); auto size = fd.get_size().move_as_ok();
fd.seek(size).ignore(); fd.seek(size).ignore();
fd.write("a").ignore(); fd.write("a").ignore();
fd.seek(size).ignore(); fd.seek(size).ignore();

3
td/telegram/files/FileHashUploader.cpp
View File

@ -37,7 +37,8 @@ void FileHashUploader::start_up() {
Status FileHashUploader::init() { Status FileHashUploader::init() {
TRY_RESULT(fd, FileFd::open(local_.path_, FileFd::Read)); TRY_RESULT(fd, FileFd::open(local_.path_, FileFd::Read));
if (fd.get_size() != size_) { TRY_RESULT(file_size, fd.get_size());
if (file_size != size_) {
return Status::Error("size mismatch"); return Status::Error("size mismatch");
} }
fd_ = BufferedFd<FileFd>(std::move(fd)); fd_ = BufferedFd<FileFd>(std::move(fd));

3
td/telegram/files/FileLoaderUtils.cpp
View File

@ -130,7 +130,8 @@ Result<string> search_file(CSlice dir, CSlice name, int64 expected_size) {
FileFd fd; FileFd fd;
std::string path; std::string path;
std::tie(fd, path) = r_pair.move_as_ok(); std::tie(fd, path) = r_pair.move_as_ok();
if (fd.stat().size_ != expected_size) { auto r_size = fd.get_size();
if (r_size.is_error() || r_size.ok() != expected_size) {
return true; return true;
} }
fd.close(); fd.close();

4
td/telegram/files/FileUploader.cpp
View File

@ -164,13 +164,13 @@ Result<FileLoader::PrefixInfo> FileUploader::on_update_local_location(const Loca
if (local_is_ready) { if (local_is_ready) {
CHECK(!fd_.empty()); CHECK(!fd_.empty());
local_size = fd_.get_size(); TRY_RESULT(local_size, fd_.get_size());
LOG(INFO) << "Set file local_size to " << local_size; LOG(INFO) << "Set file local_size to " << local_size;
if (local_size == 0) { if (local_size == 0) {
return Status::Error("Can't upload empty file"); return Status::Error("Can't upload empty file");
} }
} else if (!fd_.empty()) { } else if (!fd_.empty()) {
auto real_local_size = fd_.get_size(); TRY_RESULT(real_local_size, fd_.get_size());
if (real_local_size < local_size) { if (real_local_size < local_size) {
LOG(ERROR) << tag("real_local_size", real_local_size) << " < " << tag("local_size", local_size); LOG(ERROR) << tag("real_local_size", real_local_size) << " < " << tag("local_size", local_size);
PrefixInfo info; PrefixInfo info;

10
tddb/td/db/binlog/Binlog.cpp
View File

@ -445,7 +445,9 @@ void Binlog::update_read_encryption() {
CHECK(binlog_reader_ptr_); CHECK(binlog_reader_ptr_);
switch (encryption_type_) { switch (encryption_type_) {
case EncryptionType::None: { case EncryptionType::None: {
binlog_reader_ptr_->set_input(&buffer_reader_, false, fd_.get_size()); auto r_file_size = fd_.get_size();
r_file_size.ensure();
binlog_reader_ptr_->set_input(&buffer_reader_, false, r_file_size.ok());
byte_flow_flag_ = false; byte_flow_flag_ = false;
break; break;
} }
@ -456,7 +458,9 @@ void Binlog::update_read_encryption() {
byte_flow_sink_ = ByteFlowSink(); byte_flow_sink_ = ByteFlowSink();
byte_flow_source_ >> aes_xcode_byte_flow_ >> byte_flow_sink_; byte_flow_source_ >> aes_xcode_byte_flow_ >> byte_flow_sink_;
byte_flow_flag_ = true; byte_flow_flag_ = true;
binlog_reader_ptr_->set_input(byte_flow_sink_.get_output(), true, fd_.get_size()); auto r_file_size = fd_.get_size();
r_file_size.ensure();
binlog_reader_ptr_->set_input(byte_flow_sink_.get_output(), true, r_file_size.ok());
break; break;
} }
} }
@ -549,7 +553,7 @@ Status Binlog::load_binlog(const Callback &callback, const Callback &debug_callb
} }
}); });
auto fd_size = fd_.get_size(); TRY_RESULT(fd_size, fd_.get_size());
if (offset != fd_size) { if (offset != fd_size) {
LOG(ERROR) << "Truncate " << tag("path", path_) << tag("old_size", fd_size) << tag("new_size", offset); LOG(ERROR) << "Truncate " << tag("path", path_) << tag("old_size", fd_size) << tag("new_size", offset);
fd_.seek(offset).ensure(); fd_.seek(offset).ensure();

3
tdutils/td/utils/FileLog.cpp
View File

@ -40,7 +40,8 @@ Status FileLog::init(string path, int64 rotate_threshold) {
} else { } else {
path_ = r_path.move_as_ok(); path_ = r_path.move_as_ok();
} }
size_ = fd_.get_size(); TRY_RESULT(size, fd_.get_size());
size_ = size;
rotate_threshold_ = rotate_threshold; rotate_threshold_ = rotate_threshold;
return Status::OK(); return Status::OK();
} }

3
tdutils/td/utils/filesystem.cpp
View File

@ -37,7 +37,8 @@ template <class T>
Result<T> read_file_impl(CSlice path, int64 size, int64 offset) { Result<T> read_file_impl(CSlice path, int64 size, int64 offset) {
TRY_RESULT(from_file, FileFd::open(path, FileFd::Read)); TRY_RESULT(from_file, FileFd::open(path, FileFd::Read));
if (size == -1) { if (size == -1) {
size = from_file.get_size(); TRY_RESULT(file_size, from_file.get_size());
size = file_size;
} }
if (size < 0) { if (size < 0) {
return Status::Error("Failed to read file: invalid size"); return Status::Error("Failed to read file: invalid size");

7
tdutils/td/utils/port/FileFd.cpp
View File

@ -424,8 +424,9 @@ NativeFd FileFd::move_as_native_fd() {
return res; return res;
} }
int64 FileFd::get_size() { Result<int64> FileFd::get_size() {
return stat().size_; TRY_RESULT(s, stat());
return s.size_;
} }
#if TD_PORT_WINDOWS #if TD_PORT_WINDOWS
@ -435,7 +436,7 @@ static uint64 filetime_to_unix_time_nsec(LONGLONG filetime) {
} }
#endif #endif
Stat FileFd::stat() { Result<Stat> FileFd::stat() {
CHECK(!empty()); CHECK(!empty());
#if TD_PORT_POSIX #if TD_PORT_POSIX
return detail::fstat(get_native_fd().fd()); return detail::fstat(get_native_fd().fd());

4
tdutils/td/utils/port/FileFd.h
View File

@ -49,9 +49,9 @@ class FileFd {
void close(); void close();
bool empty() const; bool empty() const;
int64 get_size(); Result<int64> get_size();
Stat stat(); Result<Stat> stat();
Status sync() TD_WARN_UNUSED_RESULT; Status sync() TD_WARN_UNUSED_RESULT;

8
tdutils/td/utils/port/Stat.cpp
View File

@ -111,11 +111,13 @@ Stat from_native_stat(const struct ::stat &buf) {
return res; return res;
} }
Stat fstat(int native_fd) { Result<Stat> fstat(int native_fd) {
struct ::stat buf; struct ::stat buf;
int err = detail::skip_eintr([&] { return ::fstat(native_fd, &buf); }); int err = detail::skip_eintr([&] { return ::fstat(native_fd, &buf); });
auto fstat_errno = errno; auto fstat_errno = errno;
LOG_IF(FATAL, err < 0) << Status::PosixError(fstat_errno, PSLICE() << "Stat for fd " << native_fd << " failed"); if (err < 0) {
return Status::PosixError(fstat_errno, PSLICE() << "Stat for fd " << native_fd << " failed");
}
return detail::from_native_stat(buf); return detail::from_native_stat(buf);
} }
@ -135,7 +137,7 @@ Status update_atime(int native_fd) {
} }
return Status::OK(); return Status::OK();
#elif TD_DARWIN #elif TD_DARWIN
auto info = fstat(native_fd); TRY_RESULT(info, fstat(native_fd));
timeval upd[2]; timeval upd[2];
auto now = Clocks::system(); auto now = Clocks::system();
// access time // access time

2
tdutils/td/utils/port/Stat.h
View File

@ -34,7 +34,7 @@ Result<CpuStat> cpu_stat() TD_WARN_UNUSED_RESULT;
#if TD_PORT_POSIX #if TD_PORT_POSIX
namespace detail { namespace detail {
Stat fstat(int native_fd); // TODO return Result<Stat> Result<Stat> fstat(int native_fd);
} // namespace detail } // namespace detail
Status update_atime(CSlice path) TD_WARN_UNUSED_RESULT; Status update_atime(CSlice path) TD_WARN_UNUSED_RESULT;

3
tdutils/td/utils/port/path.cpp
View File

@ -359,7 +359,8 @@ Result<bool> walk_path_file(string &path, const WalkFunction &func) {
Result<bool> walk_path(string &path, const WalkFunction &func) { Result<bool> walk_path(string &path, const WalkFunction &func) {
TRY_RESULT(fd, FileFd::open(path, FileFd::Read)); TRY_RESULT(fd, FileFd::open(path, FileFd::Read));
auto stat = fd.stat(); TRY_RESULT(stat, fd.stat());
bool is_dir = stat.is_dir_; bool is_dir = stat.is_dir_;
bool is_reg = stat.is_reg_; bool is_reg = stat.is_reg_;
if (is_dir) { if (is_dir) {

60
tdutils/test/port.cpp
View File

@ -35,47 +35,41 @@ TEST(Port, files) {
int cnt = 0; int cnt = 0;
const int ITER_COUNT = 1000; const int ITER_COUNT = 1000;
for (int i = 0; i < ITER_COUNT; i++) { for (int i = 0; i < ITER_COUNT; i++) {
walk_path(main_dir, walk_path(main_dir, [&](CSlice name, WalkPath::Type type) {
[&](CSlice name, WalkPath::Type type) { if (type == WalkPath::Type::NotDir) {
if (type == WalkPath::Type::NotDir) { ASSERT_TRUE(name == fd_path || name == fd2_path);
ASSERT_TRUE(name == fd_path || name == fd2_path); }
} cnt++;
cnt++; }).ensure();
})
.ensure();
} }
ASSERT_EQ((5 * 2 + 2) * ITER_COUNT, cnt); ASSERT_EQ((5 * 2 + 2) * ITER_COUNT, cnt);
bool was_abort = false; bool was_abort = false;
walk_path(main_dir, walk_path(main_dir, [&](CSlice name, WalkPath::Type type) {
[&](CSlice name, WalkPath::Type type) { CHECK(!was_abort);
CHECK(!was_abort); if (type == WalkPath::Type::EnterDir && ends_with(name, PSLICE() << TD_DIR_SLASH << "B")) {
if (type == WalkPath::Type::EnterDir && ends_with(name, PSLICE() << TD_DIR_SLASH << "B")) { was_abort = true;
was_abort = true; return WalkPath::Action::Abort;
return WalkPath::Action::Abort; }
} return WalkPath::Action::Continue;
return WalkPath::Action::Continue; }).ensure();
})
.ensure();
CHECK(was_abort); CHECK(was_abort);
cnt = 0; cnt = 0;
bool is_first_dir = true; bool is_first_dir = true;
walk_path(main_dir, walk_path(main_dir, [&](CSlice name, WalkPath::Type type) {
[&](CSlice name, WalkPath::Type type) { cnt++;
cnt++; if (type == WalkPath::Type::EnterDir) {
if (type == WalkPath::Type::EnterDir) { if (is_first_dir) {
if (is_first_dir) { is_first_dir = false;
is_first_dir = false; } else {
} else { return WalkPath::Action::SkipDir;
return WalkPath::Action::SkipDir; }
} }
} return WalkPath::Action::Continue;
return WalkPath::Action::Continue; }).ensure();
})
.ensure();
ASSERT_EQ(6, cnt); ASSERT_EQ(6, cnt);
ASSERT_EQ(0u, fd.get_size()); ASSERT_EQ(0u, fd.get_size().move_as_ok());
ASSERT_EQ(12u, fd.write("Hello world!").move_as_ok()); ASSERT_EQ(12u, fd.write("Hello world!").move_as_ok());
ASSERT_EQ(4u, fd.pwrite("abcd", 1).move_as_ok()); ASSERT_EQ(4u, fd.pwrite("abcd", 1).move_as_ok());
char buf[100]; char buf[100];
@ -86,7 +80,7 @@ TEST(Port, files) {
ASSERT_TRUE(FileFd::open(main_dir, FileFd::Read | FileFd::CreateNew).is_error()); ASSERT_TRUE(FileFd::open(main_dir, FileFd::Read | FileFd::CreateNew).is_error());
fd = FileFd::open(fd_path, FileFd::Read | FileFd::Create).move_as_ok(); fd = FileFd::open(fd_path, FileFd::Read | FileFd::Create).move_as_ok();
ASSERT_EQ(13u, fd.get_size()); ASSERT_EQ(13u, fd.get_size().move_as_ok());
ASSERT_EQ(4u, fd.pread(buf_slice.substr(0, 4), 1).move_as_ok()); ASSERT_EQ(4u, fd.pread(buf_slice.substr(0, 4), 1).move_as_ok());
ASSERT_STREQ("abcd", buf_slice.substr(0, 4)); ASSERT_STREQ("abcd", buf_slice.substr(0, 4));