diff options
author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-12-04 14:47:50 +0100 |
---|---|---|
committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-12-05 11:08:08 +0100 |
commit | 9a164558010af84d834dee86f1929bd6582a1ccb (patch) | |
tree | 7b0fabd2e581baa36b2e3b1acc154c2f278411be /src/buildtool/file_system/git_cas.cpp | |
parent | 31ce2ad2b7457147621c5aa104c677754b37d11d (diff) | |
download | justbuild-9a164558010af84d834dee86f1929bd6582a1ccb.tar.gz |
GitCAS: remove mutex and locks
...since there are no unique_locks any more.
Diffstat (limited to 'src/buildtool/file_system/git_cas.cpp')
-rw-r--r-- | src/buildtool/file_system/git_cas.cpp | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/src/buildtool/file_system/git_cas.cpp b/src/buildtool/file_system/git_cas.cpp index c72da3fc..7e004934 100644 --- a/src/buildtool/file_system/git_cas.cpp +++ b/src/buildtool/file_system/git_cas.cpp @@ -150,15 +150,12 @@ auto GitCAS::ReadObject(std::string const& id, bool is_hex_id) const noexcept } git_odb_object* obj = nullptr; - { - std::shared_lock lock{mutex_}; - if (git_odb_read(&obj, odb_.get(), &oid.value()) != 0) { - Logger::Log(LogLevel::Error, - "reading git object {} from database failed with:\n{}", - is_hex_id ? id : ToHexString(id), - GitLastError()); - return std::nullopt; - } + if (git_odb_read(&obj, odb_.get(), &oid.value()) != 0) { + Logger::Log(LogLevel::Error, + "reading git object {} from database failed with:\n{}", + is_hex_id ? id : ToHexString(id), + GitLastError()); + return std::nullopt; } std::string data(static_cast<char const*>(git_odb_object_data(obj)), @@ -183,16 +180,13 @@ auto GitCAS::ReadHeader(std::string const& id, bool is_hex_id) const noexcept std::size_t size{}; git_object_t type{}; - { - std::shared_lock lock{mutex_}; - if (git_odb_read_header(&size, &type, odb_.get(), &oid.value()) != 0) { - Logger::Log(LogLevel::Error, - "reading git object header {} from database failed " - "with:\n{}", - is_hex_id ? id : ToHexString(id), - GitLastError()); - return std::nullopt; - } + if (git_odb_read_header(&size, &type, odb_.get(), &oid.value()) != 0) { + Logger::Log(LogLevel::Error, + "reading git object header {} from database failed " + "with:\n{}", + is_hex_id ? id : ToHexString(id), + GitLastError()); + return std::nullopt; } if (auto obj_type = GitTypeToObjectType(type)) { |