summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/buildtool/file_system/git_cas.cpp32
-rw-r--r--src/buildtool/file_system/git_cas.hpp6
-rw-r--r--src/buildtool/file_system/git_repo.cpp71
3 files changed, 26 insertions, 83 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)) {
diff --git a/src/buildtool/file_system/git_cas.hpp b/src/buildtool/file_system/git_cas.hpp
index 5d200661..37f197f0 100644
--- a/src/buildtool/file_system/git_cas.hpp
+++ b/src/buildtool/file_system/git_cas.hpp
@@ -19,7 +19,6 @@
#include <filesystem>
#include <memory>
#include <optional>
-#include <shared_mutex>
#include <string>
#include <utility>
@@ -80,11 +79,6 @@ class GitCAS {
// git folder path of repo
std::filesystem::path git_path_;
- // mutex to guard odb while setting up a "fake" repository; it needs to be
- // uniquely owned while wrapping the odb, but then git operations are free
- // to share it.
- mutable std::shared_mutex mutex_;
-
friend class GitRepo; // allow access to ODB
};
diff --git a/src/buildtool/file_system/git_repo.cpp b/src/buildtool/file_system/git_repo.cpp
index ae6224ac..fdaa30cf 100644
--- a/src/buildtool/file_system/git_repo.cpp
+++ b/src/buildtool/file_system/git_repo.cpp
@@ -22,7 +22,6 @@
#include <limits>
#include <map>
#include <mutex>
-#include <shared_mutex>
#include <sstream>
#include <string_view>
#include <thread>
@@ -509,8 +508,6 @@ auto GitRepo::CommitDirectory(std::filesystem::path const& dir,
true /*fatal*/);
return std::nullopt;
}
- // share the odb lock
- std::shared_lock lock{GetGitCAS()->mutex_};
// Due to limitations of Git in general, and libgit2 in particular, by
// which updating the index with entries that have Git-specific magic
@@ -619,8 +616,6 @@ auto GitRepo::KeepTag(std::string const& commit,
true /*fatal*/);
return std::nullopt;
}
- // share the odb lock
- std::shared_lock lock{GetGitCAS()->mutex_};
// get commit spec
git_object* target_ptr{nullptr};
@@ -728,8 +723,6 @@ auto GitRepo::GetHeadCommit(anon_logger_ptr const& logger) noexcept
true /*fatal*/);
return std::nullopt;
}
- // share the odb lock
- std::shared_lock lock{GetGitCAS()->mutex_};
// get root commit id
git_oid head_oid;
@@ -854,8 +847,6 @@ auto GitRepo::KeepTree(std::string const& tree_id,
true /*fatal*/);
return std::nullopt;
}
- // share the odb lock
- std::shared_lock lock{GetGitCAS()->mutex_};
// get tree oid
git_oid tree_oid;
@@ -980,8 +971,6 @@ auto GitRepo::GetSubtreeFromCommit(std::string const& commit,
LogLevel::Debug,
"Subtree id retrieval from commit called on a real repository");
}
- // share the odb lock
- std::shared_lock lock{GetGitCAS()->mutex_};
// get commit object
git_oid commit_oid;
@@ -1080,8 +1069,6 @@ auto GitRepo::GetSubtreeFromTree(std::string const& tree_id,
"Subtree id retrieval from tree called on a real "
"repository");
}
- // share the odb lock
- std::shared_lock lock{GetGitCAS()->mutex_};
// get tree object from tree id
git_oid tree_oid;
@@ -1223,13 +1210,8 @@ auto GitRepo::CheckCommitExists(std::string const& commit,
}
git_commit* commit_obj = nullptr;
- int lookup_res{};
- {
- // share the odb lock
- std::shared_lock lock{GetGitCAS()->mutex_};
- lookup_res = git_commit_lookup(
- &commit_obj, &GetGitRepository(), &commit_oid);
- }
+ int const lookup_res =
+ git_commit_lookup(&commit_obj, &GetGitRepository(), &commit_oid);
if (lookup_res != 0) {
if (lookup_res == GIT_ENOTFOUND) {
// cleanup resources
@@ -1329,13 +1311,8 @@ auto GitRepo::CheckTreeExists(std::string const& tree_id,
}
// get tree object
git_tree* tree_ptr = nullptr;
- int lookup_res{};
- {
- // share the odb lock
- std::shared_lock lock{GetGitCAS()->mutex_};
- lookup_res =
- git_tree_lookup(&tree_ptr, &GetGitRepository(), &tree_oid);
- }
+ int const lookup_res =
+ git_tree_lookup(&tree_ptr, &GetGitRepository(), &tree_oid);
git_tree_free(tree_ptr);
if (lookup_res != 0) {
if (lookup_res == GIT_ENOTFOUND) {
@@ -1381,13 +1358,8 @@ auto GitRepo::CheckBlobExists(std::string const& blob_id,
}
// get blob object
git_blob* blob_ptr = nullptr;
- int lookup_res{};
- {
- // share the odb lock
- std::shared_lock lock{GetGitCAS()->mutex_};
- lookup_res =
- git_blob_lookup(&blob_ptr, &GetGitRepository(), &blob_oid);
- }
+ int const lookup_res =
+ git_blob_lookup(&blob_ptr, &GetGitRepository(), &blob_oid);
git_blob_free(blob_ptr);
if (lookup_res != 0) {
if (lookup_res == GIT_ENOTFOUND) {
@@ -1433,13 +1405,8 @@ auto GitRepo::TryReadBlob(std::string const& blob_id,
}
// get blob object
git_blob* blob_ptr = nullptr;
- int lookup_res{};
- {
- // share the odb lock
- std::shared_lock lock{GetGitCAS()->mutex_};
- lookup_res =
- git_blob_lookup(&blob_ptr, &GetGitRepository(), &blob_oid);
- }
+ int const lookup_res =
+ git_blob_lookup(&blob_ptr, &GetGitRepository(), &blob_oid);
git_blob_free(blob_ptr);
if (lookup_res != 0) {
if (lookup_res == GIT_ENOTFOUND) {
@@ -1482,8 +1449,6 @@ auto GitRepo::WriteBlob(std::string const& content,
Logger::Log(LogLevel::Debug,
"Blob writer called on a real repository");
}
- // share the odb lock
- std::shared_lock lock{GetGitCAS()->mutex_};
git_oid blob_oid;
if (git_blob_create_from_buffer(&blob_oid,
@@ -1521,9 +1486,6 @@ auto GitRepo::GetObjectByPathFromTree(std::string const& tree_id,
}
// check if path is not trivial
if (rel_path != ".") {
- // share the odb lock
- std::shared_lock lock{GetGitCAS()->mutex_};
-
// get tree object from tree id
git_oid tree_oid;
if (git_oid_fromstr(&tree_oid, tree_id.c_str()) != 0) {
@@ -1720,15 +1682,11 @@ auto GitRepo::ReadTree(std::string const& id,
// lookup tree
git_tree* tree_ptr{nullptr};
- {
- // share the odb lock
- std::shared_lock lock{GetGitCAS()->mutex_};
- if (git_tree_lookup(&tree_ptr, &GetGitRepository(), &(*oid)) != 0) {
- Logger::Log(LogLevel::Debug,
- "failed to lookup Git tree {}",
- is_hex_id ? std::string{id} : ToHexString(id));
- return std::nullopt;
- }
+ if (git_tree_lookup(&tree_ptr, &GetGitRepository(), &(*oid)) != 0) {
+ Logger::Log(LogLevel::Debug,
+ "failed to lookup Git tree {}",
+ is_hex_id ? std::string{id} : ToHexString(id));
+ return std::nullopt;
}
auto tree = std::unique_ptr<git_tree, decltype(&tree_closer)>{
tree_ptr, tree_closer};
@@ -1809,9 +1767,6 @@ auto GitRepo::CreateTree(tree_entries_t const& entries) const noexcept
// Check consistency of entries. Also check that entries exist.
ExpectsAudit(ValidateEntries(entries, GetGitCAS()));
#endif // NDEBUG
- // share the odb lock
- std::shared_lock lock{GetGitCAS()->mutex_};
-
try {
// As the libgit2 treebuilder checks for magic names and does not allow
// us to add any and all entries to a Git tree, we resort to
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-03 21:01:00 +0000