max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-29 17:16:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5644 from tweag/fix-interrupted-data-race

Browse source 
Fix a minor data race with _isInterrupted
This commit is contained in:
Eelco Dolstra 2021-11-25 13:55:03 +01:00 committed by GitHub
commit 1f7584d24c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats 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; static thread_local bool interruptThrown = false;
thread_local std::function<bool()> interruptCheck; thread_local std::function<bool()> interruptCheck;

2
src/libutil/util.hh
View file

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