mirror of
https://github.com/NixOS/nix
synced 2024-09-19 23:03:53 -04:00
Fix a minor data race with _isInterrupted
This commit is contained in:
parent
884674a8e2
commit
2970ca18bf
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue