summaryrefslogtreecommitdiff
path: root/src/buildtool/file_system
diff options
context:
space:
mode:
Diffstat (limited to 'src/buildtool/file_system')
-rw-r--r--src/buildtool/file_system/TARGETS1
-rw-r--r--src/buildtool/file_system/git_repo.cpp119
-rw-r--r--src/buildtool/file_system/git_repo.hpp32
3 files changed, 14 insertions, 138 deletions
diff --git a/src/buildtool/file_system/TARGETS b/src/buildtool/file_system/TARGETS
index ff145084..fbd67e14 100644
--- a/src/buildtool/file_system/TARGETS
+++ b/src/buildtool/file_system/TARGETS
@@ -138,6 +138,7 @@
, ["src/utils/cpp", "gsl"]
, ["src/utils/cpp", "hex_string"]
, ["src/utils/cpp", "path"]
+ , ["src/utils/cpp", "tmp_dir"]
]
, "cflags": ["-pthread"]
}
diff --git a/src/buildtool/file_system/git_repo.cpp b/src/buildtool/file_system/git_repo.cpp
index 4a2fb626..dd346b98 100644
--- a/src/buildtool/file_system/git_repo.cpp
+++ b/src/buildtool/file_system/git_repo.cpp
@@ -17,6 +17,8 @@
#include <algorithm>
#include <cstddef>
#include <map>
+#include <mutex>
+#include <shared_mutex>
#include <sstream>
#include <string_view>
#include <thread>
@@ -31,6 +33,7 @@
#include "src/utils/cpp/gsl.hpp"
#include "src/utils/cpp/hex_string.hpp"
#include "src/utils/cpp/path.hpp"
+#include "src/utils/cpp/tmp_dir.hpp"
extern "C" {
#include <git2.h>
@@ -367,32 +370,12 @@ const auto kCertificatePassthrough = [](git_cert* /*cert*/,
} // namespace
#endif // BOOTSTRAP_BUILD_TOOL
-GitRepo::GuardedRepo::GuardedRepo(std::shared_mutex* mutex) noexcept
- : mutex_{mutex} {}
-
-auto GitRepo::GuardedRepo::Ptr() -> git_repository* {
- return repo_;
-}
-
-auto GitRepo::GuardedRepo::PtrRef() -> git_repository** {
- return &repo_;
-}
-
-GitRepo::GuardedRepo::~GuardedRepo() noexcept {
-#ifndef BOOTSTRAP_BUILD_TOOL
- std::unique_lock lock{*mutex_};
- if (repo_ != nullptr) {
- git_repository_free(repo_);
- }
-#endif
-}
-
auto GitRepo::Open(GitCASPtr git_cas) noexcept -> std::optional<GitRepo> {
#ifdef BOOTSTRAP_BUILD_TOOL
return std::nullopt;
#else
auto repo = GitRepo(std::move(git_cas));
- if (not repo.repo_) {
+ if (not repo.git_cas_) {
return std::nullopt;
}
return repo;
@@ -405,106 +388,26 @@ auto GitRepo::Open(std::filesystem::path const& repo_path) noexcept
return std::nullopt;
#else
auto repo = GitRepo(repo_path);
- if (not repo.repo_) {
+ if (not repo.git_cas_) {
return std::nullopt;
}
return repo;
#endif // BOOTSTRAP_BUILD_TOOL
}
-GitRepo::GitRepo(GitCASPtr git_cas) noexcept {
-#ifndef BOOTSTRAP_BUILD_TOOL
- try {
- if (git_cas != nullptr) {
- auto repo_ptr = std::make_shared<GuardedRepo>(&git_cas->mutex_);
- {
- // acquire the odb lock exclusively
- std::unique_lock lock{git_cas->mutex_};
- if (git_repository_wrap_odb(repo_ptr->PtrRef(),
- git_cas->odb_.get()) != 0) {
- Logger::Log(LogLevel::Error,
- "could not create wrapper for git repository");
- return;
- }
- }
- repo_ = std::move(repo_ptr);
- is_repo_fake_ = true;
- git_cas_ = std::move(git_cas);
- }
- else {
- Logger::Log(LogLevel::Error,
- "git repository creation attempted with null odb!");
- }
- } catch (std::exception const& ex) {
- Logger::Log(LogLevel::Error,
- "opening git object database failed with:\n{}",
- ex.what());
- }
-#endif // BOOTSTRAP_BUILD_TOOL
-}
+GitRepo::GitRepo(GitCASPtr git_cas) noexcept
+ : git_cas_{std::move(git_cas)}, is_repo_fake_{true} {}
-GitRepo::GitRepo(std::filesystem::path const& repo_path) noexcept {
-#ifndef BOOTSTRAP_BUILD_TOOL
- try {
- static std::mutex repo_mutex{};
- std::unique_lock lock{repo_mutex};
- auto cas = std::make_shared<GitCAS>();
- // open repo, but retain it
- auto repo_ptr = std::make_shared<GuardedRepo>(&cas->mutex_);
- if (git_repository_open_ext(repo_ptr->PtrRef(),
- repo_path.c_str(),
- GIT_REPOSITORY_OPEN_NO_SEARCH,
- nullptr) != 0) {
- Logger::Log(LogLevel::Error,
- "opening git repository {} failed with:\n{}",
- repo_path.string(),
- GitLastError());
- return;
- }
- repo_ = repo_ptr; // retain repo pointer
- // get odb
- git_odb* odb_ptr{nullptr};
- git_repository_odb(&odb_ptr, repo_->Ptr());
- if (odb_ptr == nullptr) {
- Logger::Log(LogLevel::Error,
- "retrieving odb of git repository {} failed with:\n{}",
- repo_path.string(),
- GitLastError());
- // release resources
- git_odb_free(odb_ptr);
- return;
- }
- cas->odb_.reset(odb_ptr); // retain odb pointer
- is_repo_fake_ = false;
- // save root path; this differs if repository is bare or not
- if (git_repository_is_bare(repo_->Ptr()) != 0) {
- cas->git_path_ = std::filesystem::absolute(
- ToNormalPath(git_repository_path(repo_->Ptr())));
- }
- else {
- cas->git_path_ = std::filesystem::absolute(
- ToNormalPath(git_repository_workdir(repo_->Ptr())));
- }
- // retain the pointer
- git_cas_ = std::static_pointer_cast<GitCAS const>(cas);
- } catch (std::exception const& ex) {
- Logger::Log(LogLevel::Error,
- "opening git object database failed with:\n{}",
- ex.what());
- }
-#endif // BOOTSTRAP_BUILD_TOOL
-}
+GitRepo::GitRepo(std::filesystem::path const& repo_path) noexcept
+ : git_cas_{GitCAS::Open(repo_path)}, is_repo_fake_{false} {}
GitRepo::GitRepo(GitRepo&& other) noexcept
- : git_cas_{std::move(other.git_cas_)},
- repo_{std::move(other.repo_)},
- is_repo_fake_{other.is_repo_fake_} {
+ : git_cas_{std::move(other.git_cas_)}, is_repo_fake_{other.is_repo_fake_} {
other.git_cas_ = nullptr;
}
auto GitRepo::operator=(GitRepo&& other) noexcept -> GitRepo& {
git_cas_ = std::move(other.git_cas_);
- repo_ = std::move(other.repo_);
is_repo_fake_ = other.is_repo_fake_;
other.git_cas_ = nullptr;
return *this;
@@ -581,7 +484,7 @@ auto GitRepo::GetGitCAS() const noexcept -> GitCASPtr {
}
auto GitRepo::GetGitRepository() const& noexcept -> git_repository& {
- return *repo_->Ptr();
+ return *GetGitCAS()->GetRepository();
}
auto GitRepo::GetGitPath() const noexcept -> std::filesystem::path const& {
diff --git a/src/buildtool/file_system/git_repo.hpp b/src/buildtool/file_system/git_repo.hpp
index 2d5f4df1..223dceb1 100644
--- a/src/buildtool/file_system/git_repo.hpp
+++ b/src/buildtool/file_system/git_repo.hpp
@@ -313,37 +313,9 @@ class GitRepo {
-> std::shared_ptr<git_config>;
private:
- /// \brief Wrapped git_repository with guarded destructor.
- /// Kept privately nested to avoid misuse of its raw pointer members.
- class GuardedRepo {
- public:
- GuardedRepo() noexcept = delete;
- explicit GuardedRepo(std::shared_mutex* mutex) noexcept;
- ~GuardedRepo() noexcept;
-
- // prohibit moves and copies
- GuardedRepo(GuardedRepo const&) = delete;
- GuardedRepo(GuardedRepo&& other) = delete;
- auto operator=(GuardedRepo const&) = delete;
- auto operator=(GuardedRepo&& other) = delete;
-
- // get the bare pointer
- [[nodiscard]] auto Ptr() -> git_repository*;
- [[nodiscard]] auto PtrRef() -> git_repository**;
-
- private:
- std::shared_mutex* mutex_;
- git_repository* repo_{nullptr};
- };
-
- using GuardedRepoPtr = std::shared_ptr<GuardedRepo>;
-
- // IMPORTANT! The GitCAS object must be defined before the repo object to
- // keep the GitContext alive until cleanup ends.
- GitCASPtr git_cas_{nullptr};
- GuardedRepoPtr repo_{nullptr};
+ GitCASPtr git_cas_;
// default to real repo, as that is non-thread-safe
- bool is_repo_fake_{false};
+ bool is_repo_fake_;
protected:
/// \brief Open "fake" repository wrapper for existing CAS.
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-05 23:34:58 +0000