octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-09 14:50:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/syncthing: Clean up deadlock envvars

Browse Source 
So STDEADLOCK seems to do the same thing as STDEADLOCKTIMEOUT, except in
the other package. Consolidate?

STDEADLOCKTHRESHOLD is actually called STLOCKTHRESHOLD, correct the help
text.

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4598
This commit is contained in:
Jakob Borg 2017-12-13 19:40:12 +00:00 committed by Audrius Butkevicius
parent a4147d9019
commit 8c91ced784
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/syncthing/main.go
View File

@ -179,14 +179,11 @@ are mostly useful for developers. Use with care.
STPERFSTATS Write running performance statistics to perf-$pid.csv. Not STPERFSTATS Write running performance statistics to perf-$pid.csv. Not
supported on Windows. supported on Windows.
STDEADLOCK Used for debugging internal deadlocks. Use only under
direction of a developer.
STDEADLOCKTIMEOUT Used for debugging internal deadlocks; sets debug STDEADLOCKTIMEOUT Used for debugging internal deadlocks; sets debug
sensitivity. Use only under direction of a developer. sensitivity. Use only under direction of a developer.
STDEADLOCKTHRESHOLD Used for debugging internal deadlocks; sets debug STLOCKTHRESHOLD Used for debugging internal deadlocks; sets debug
sensitivity. Use only under direction of a developer. sensitivity. Use only under direction of a developer.
STNORESTART Equivalent to the -no-restart argument. Disable the STNORESTART Equivalent to the -no-restart argument. Disable the
Syncthing monitor process which handles restarts for some Syncthing monitor process which handles restarts for some

4
lib/sync/debug.go
View File

@ -24,7 +24,7 @@ var (
// }" variable, as it may be rather performance critical and does // }" variable, as it may be rather performance critical and does
// nonstandard things (from a debug logging PoV). // nonstandard things (from a debug logging PoV).
debug = strings.Contains(os.Getenv("STTRACE"), "sync") || os.Getenv("STTRACE") == "all" debug = strings.Contains(os.Getenv("STTRACE"), "sync") || os.Getenv("STTRACE") == "all"
useDeadlock = os.Getenv("STDEADLOCK") != "" useDeadlock = os.Getenv("STDEADLOCKTIMEOUT") != ""
) )
func init() { func init() {
@ -33,7 +33,7 @@ func init() {
if n, err := strconv.Atoi(os.Getenv("STLOCKTHRESHOLD")); err == nil { if n, err := strconv.Atoi(os.Getenv("STLOCKTHRESHOLD")); err == nil {
threshold = time.Duration(n) * time.Millisecond threshold = time.Duration(n) * time.Millisecond
} }
if n, err := strconv.Atoi(os.Getenv("STDEADLOCK")); err == nil { if n, err := strconv.Atoi(os.Getenv("STDEADLOCKTIMEOUT")); err == nil {
deadlock.Opts.DeadlockTimeout = time.Duration(n) * time.Second deadlock.Opts.DeadlockTimeout = time.Duration(n) * time.Second
} }
l.Debugf("Enabling lock logging at %v threshold", threshold) l.Debugf("Enabling lock logging at %v threshold", threshold)