NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity

Make tarball cache more interruptible

Browse source
This commit is contained in:
Robert Hensing 2024-08-26 11:38:40 +02:00
parent 5dd6c4f062
commit d0f8a92363
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libfetchers/git-utils.cc
View file

@ -211,8 +211,12 @@ struct GitRepoImpl : GitRepo, std::enable_shared_from_this<GitRepoImpl>
try { try {
PackBuilder packBuilder; PackBuilder packBuilder;
git_packbuilder_new(Setter(packBuilder), *this); git_packbuilder_new(Setter(packBuilder), *this);
checkInterrupt();
git_mempack_write_thin_pack(mempack_backend, packBuilder.get()); git_mempack_write_thin_pack(mempack_backend, packBuilder.get());
checkInterrupt();
// TODO make git_packbuilder_write_buf() interruptible
git_packbuilder_write_buf(&buf, packBuilder.get()); git_packbuilder_write_buf(&buf, packBuilder.get());
checkInterrupt();
std::string repo_path = std::string(git_repository_path(repo.get())); std::string repo_path = std::string(git_repository_path(repo.get()));
while (!repo_path.empty() && repo_path.back() == '/') while (!repo_path.empty() && repo_path.back() == '/')
@ -224,8 +228,10 @@ struct GitRepoImpl : GitRepo, std::enable_shared_from_this<GitRepoImpl>
git_indexer_progress stats; git_indexer_progress stats;
if (git_indexer_new(Setter(indexer), pack_dir_path.c_str(), 0, nullptr, nullptr)) if (git_indexer_new(Setter(indexer), pack_dir_path.c_str(), 0, nullptr, nullptr))
throw Error("creating git packfile indexer: %s", git_error_last()->message); throw Error("creating git packfile indexer: %s", git_error_last()->message);
// TODO: feed buf in (fairly large) chunk to make this interruptible
if (git_indexer_append(indexer.get(), buf.ptr, buf.size, &stats)) if (git_indexer_append(indexer.get(), buf.ptr, buf.size, &stats))
throw Error("appending to git packfile index: %s", git_error_last()->message); throw Error("appending to git packfile index: %s", git_error_last()->message);
checkInterrupt();
if (git_indexer_commit(indexer.get(), &stats)) if (git_indexer_commit(indexer.get(), &stats))
throw Error("committing git packfile index: %s", git_error_last()->message); throw Error("committing git packfile index: %s", git_error_last()->message);
@ -237,6 +243,7 @@ struct GitRepoImpl : GitRepo, std::enable_shared_from_this<GitRepoImpl>
git_buf_dispose(&buf); git_buf_dispose(&buf);
throw; throw;
} }
checkInterrupt();
} }
uint64_t getRevCount(const Hash & rev) override uint64_t getRevCount(const Hash & rev) override

6
src/libutil/unix/signals-impl.hh
View file

@ -84,6 +84,12 @@ static inline bool getInterrupted()
return unix::_isInterrupted; return unix::_isInterrupted;
} }
/**
* Throw `Interrupted` exception if the process has been interrupted.
*
* Call this in long-running loops and between slow operations to terminate
* them as needed.
*/
void inline checkInterrupt() void inline checkInterrupt()
{ {
using namespace unix; using namespace unix;