vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Removed race condition

Browse source 
If two interrupts were fired really quickly interruptCount could have been incremented twice before the LoadUint32 making cleanup not being called at all.

Signed-off-by: Erik Dubbelboer <erik@dubbelboer.com>
This commit is contained in:
Erik Dubbelboer 2014-12-06 22:42:32 +08:00
parent 04fb504442
commit ad11e1392c
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
signal/trap.go
View file

@ -34,9 +34,8 @@ func Trap(cleanup func()) {
case os.Interrupt, syscall.SIGTERM: case os.Interrupt, syscall.SIGTERM:
// If the user really wants to interrupt, let him do so. // If the user really wants to interrupt, let him do so.
if atomic.LoadUint32(&interruptCount) < 3 { if atomic.LoadUint32(&interruptCount) < 3 {
atomic.AddUint32(&interruptCount, 1)
// Initiate the cleanup only once // Initiate the cleanup only once
if atomic.LoadUint32(&interruptCount) == 1 { if atomic.AddUint32(&interruptCount, 1) == 1 {
// Call cleanup handler // Call cleanup handler
cleanup() cleanup()
os.Exit(0) os.Exit(0)