nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-24 03:09:35 +01:00
Code Activity

Merge commit '5fcf7f04a9' into progress-bar

Browse source
This commit is contained in:
John Ericson 2023-03-11 17:01:09 -05:00
commit fece09cad9
18 changed files with 156 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/util.cc
View file

@ -1205,7 +1205,7 @@ void closeOnExec(int fd)
//////////////////////////////////////////////////////////////////////
bool _isInterrupted = false;
std::atomic<bool> _isInterrupted = false;
static thread_local bool interruptThrown = false;
thread_local std::function<bool()> interruptCheck;

2
src/libutil/util.hh
View file

@ -337,7 +337,7 @@ void closeOnExec(int fd);
/* User interruption. */
extern bool _isInterrupted;
extern std::atomic<bool> _isInterrupted;
extern thread_local std::function<bool()> interruptCheck;