1
0
mirror of https://github.com/rclone/rclone.git synced 2026-01-04 01:23:24 +00:00

Fix non-windows/non-unix builds for bwlimit/SIGUSR2 feature and add a mutex

The race detector complained whenever SIGUSR2 was sent to rclone so
this adds a mutex to prevent concurrent access.
This commit is contained in:
Nick Craig-Wood
2016-10-30 19:20:16 +00:00
parent 5454f2abd0
commit e65059e431
3 changed files with 22 additions and 31 deletions

View File

@@ -1,7 +1,7 @@
// Accounting and limiting reader
// Unix specific functions.
// +build darwin dragonfly freebsd linux netbsd openbsd
// +build darwin dragonfly freebsd linux netbsd openbsd solaris
package fs
@@ -13,11 +13,6 @@ import (
// startSignalHandler() sets a signal handler to catch SIGUSR2 and toggle throttling.
func startSignalHandler() {
// Don't do anything if no bandwidth limits requested.
if bwLimit <= 0 {
return
}
signals := make(chan os.Signal, 1)
signal.Notify(signals, syscall.SIGUSR2)
@@ -25,11 +20,14 @@ func startSignalHandler() {
// This runs forever, but blocks until the signal is received.
for {
<-signals
if tokenBucket == nil {
tokenBucket = origTokenBucket
} else {
tokenBucket = nil
tokenBucketMu.Lock()
tokenBucket, prevTokenBucket = prevTokenBucket, tokenBucket
s := "disabled"
if tokenBucket != nil {
s = "enabled"
}
tokenBucketMu.Unlock()
Log(nil, "Bandwidth limit %s by user", s)
}
}()
}