mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-07 01:09:45 +02:00
go-deadlock version bump to fix crash with go 1.23
This commit is contained in:
2
vendor/github.com/sasha-s/go-deadlock/Readme.md
generated
vendored
2
vendor/github.com/sasha-s/go-deadlock/Readme.md
generated
vendored
@ -1,4 +1,4 @@
|
||||
# Online deadlock detection in go (golang). [](https://wandbox.org/permlink/hJc6QCZowxbNm9WW) [](https://godoc.org/github.com/sasha-s/go-deadlock) [](https://travis-ci.org/sasha-s/go-deadlock) [](https://codecov.io/gh/sasha-s/go-deadlock) [](https://github.com/sasha-s/go-deadlock/releases) [](https://goreportcard.com/report/github.com/sasha-s/go-deadlock) [](https://opensource.org/licenses/Apache-2.0)
|
||||
# Online deadlock detection in go (golang). [](https://wandbox.org/permlink/hJc6QCZowxbNm9WW) [](https://godoc.org/github.com/sasha-s/go-deadlock) [](https://travis-ci.com/sasha-s/go-deadlock) [](https://codecov.io/gh/sasha-s/go-deadlock) [](https://github.com/sasha-s/go-deadlock/releases) [](https://goreportcard.com/report/github.com/sasha-s/go-deadlock) [](https://opensource.org/licenses/Apache-2.0)
|
||||
|
||||
## Why
|
||||
Deadlocks happen and are painful to debug.
|
||||
|
122
vendor/github.com/sasha-s/go-deadlock/deadlock.go
generated
vendored
122
vendor/github.com/sasha-s/go-deadlock/deadlock.go
generated
vendored
@ -21,7 +21,7 @@ var Opts = struct {
|
||||
// Would disable lock order based deadlock detection if DisableLockOrderDetection == true.
|
||||
DisableLockOrderDetection bool
|
||||
// Waiting for a lock for longer than DeadlockTimeout is considered a deadlock.
|
||||
// Ignored is DeadlockTimeout <= 0.
|
||||
// Ignored if DeadlockTimeout <= 0.
|
||||
DeadlockTimeout time.Duration
|
||||
// OnPotentialDeadlock is called each time a potential deadlock is detected -- either based on
|
||||
// lock order or on lock wait time.
|
||||
@ -69,6 +69,9 @@ type WaitGroup struct {
|
||||
sync.WaitGroup
|
||||
}
|
||||
|
||||
// NewCond is a sync.NewCond wrapper
|
||||
var NewCond = sync.NewCond
|
||||
|
||||
// A Mutex is a drop-in replacement for sync.Mutex.
|
||||
// Performs deadlock detection unless disabled in Opts.
|
||||
type Mutex struct {
|
||||
@ -179,54 +182,7 @@ func lock(lockFn func(), ptr interface{}) {
|
||||
} else {
|
||||
ch := make(chan struct{})
|
||||
currentID := goid.Get()
|
||||
go func() {
|
||||
for {
|
||||
t := time.NewTimer(Opts.DeadlockTimeout)
|
||||
defer t.Stop() // This runs after the losure finishes, but it's OK.
|
||||
select {
|
||||
case <-t.C:
|
||||
lo.mu.Lock()
|
||||
prev, ok := lo.cur[ptr]
|
||||
if !ok {
|
||||
lo.mu.Unlock()
|
||||
break // Nobody seems to be holding the lock, try again.
|
||||
}
|
||||
Opts.mu.Lock()
|
||||
fmt.Fprintln(Opts.LogBuf, header)
|
||||
fmt.Fprintln(Opts.LogBuf, "Previous place where the lock was grabbed")
|
||||
fmt.Fprintf(Opts.LogBuf, "goroutine %v lock %p\n", prev.gid, ptr)
|
||||
printStack(Opts.LogBuf, prev.stack)
|
||||
fmt.Fprintln(Opts.LogBuf, "Have been trying to lock it again for more than", Opts.DeadlockTimeout)
|
||||
fmt.Fprintf(Opts.LogBuf, "goroutine %v lock %p\n", currentID, ptr)
|
||||
printStack(Opts.LogBuf, stack)
|
||||
stacks := stacks()
|
||||
grs := bytes.Split(stacks, []byte("\n\n"))
|
||||
for _, g := range grs {
|
||||
if goid.ExtractGID(g) == prev.gid {
|
||||
fmt.Fprintln(Opts.LogBuf, "Here is what goroutine", prev.gid, "doing now")
|
||||
Opts.LogBuf.Write(g)
|
||||
fmt.Fprintln(Opts.LogBuf)
|
||||
}
|
||||
}
|
||||
lo.other(ptr)
|
||||
if Opts.PrintAllCurrentGoroutines {
|
||||
fmt.Fprintln(Opts.LogBuf, "All current goroutines:")
|
||||
Opts.LogBuf.Write(stacks)
|
||||
}
|
||||
fmt.Fprintln(Opts.LogBuf)
|
||||
if buf, ok := Opts.LogBuf.(*bufio.Writer); ok {
|
||||
buf.Flush()
|
||||
}
|
||||
Opts.mu.Unlock()
|
||||
lo.mu.Unlock()
|
||||
Opts.OnPotentialDeadlock()
|
||||
<-ch
|
||||
return
|
||||
case <-ch:
|
||||
return
|
||||
}
|
||||
}
|
||||
}()
|
||||
go checkDeadlock(stack, ptr, currentID, ch)
|
||||
lockFn()
|
||||
postLock(stack, ptr)
|
||||
close(ch)
|
||||
@ -235,6 +191,74 @@ func lock(lockFn func(), ptr interface{}) {
|
||||
postLock(stack, ptr)
|
||||
}
|
||||
|
||||
var timersPool sync.Pool
|
||||
|
||||
func acquireTimer(d time.Duration) *time.Timer {
|
||||
t, ok := timersPool.Get().(*time.Timer)
|
||||
if ok {
|
||||
_ = t.Reset(d)
|
||||
return t
|
||||
}
|
||||
return time.NewTimer(Opts.DeadlockTimeout)
|
||||
}
|
||||
|
||||
func releaseTimer(t *time.Timer) {
|
||||
if !t.Stop() {
|
||||
<-t.C
|
||||
}
|
||||
timersPool.Put(t)
|
||||
}
|
||||
|
||||
func checkDeadlock(stack []uintptr, ptr interface{}, currentID int64, ch <-chan struct{}) {
|
||||
t := acquireTimer(Opts.DeadlockTimeout)
|
||||
defer releaseTimer(t)
|
||||
for {
|
||||
select {
|
||||
case <-t.C:
|
||||
lo.mu.Lock()
|
||||
prev, ok := lo.cur[ptr]
|
||||
if !ok {
|
||||
lo.mu.Unlock()
|
||||
break // Nobody seems to be holding the lock, try again.
|
||||
}
|
||||
Opts.mu.Lock()
|
||||
fmt.Fprintln(Opts.LogBuf, header)
|
||||
fmt.Fprintln(Opts.LogBuf, "Previous place where the lock was grabbed")
|
||||
fmt.Fprintf(Opts.LogBuf, "goroutine %v lock %p\n", prev.gid, ptr)
|
||||
printStack(Opts.LogBuf, prev.stack)
|
||||
fmt.Fprintln(Opts.LogBuf, "Have been trying to lock it again for more than", Opts.DeadlockTimeout)
|
||||
fmt.Fprintf(Opts.LogBuf, "goroutine %v lock %p\n", currentID, ptr)
|
||||
printStack(Opts.LogBuf, stack)
|
||||
stacks := stacks()
|
||||
grs := bytes.Split(stacks, []byte("\n\n"))
|
||||
for _, g := range grs {
|
||||
if goid.ExtractGID(g) == prev.gid {
|
||||
fmt.Fprintln(Opts.LogBuf, "Here is what goroutine", prev.gid, "doing now")
|
||||
Opts.LogBuf.Write(g)
|
||||
fmt.Fprintln(Opts.LogBuf)
|
||||
}
|
||||
}
|
||||
lo.other(ptr)
|
||||
if Opts.PrintAllCurrentGoroutines {
|
||||
fmt.Fprintln(Opts.LogBuf, "All current goroutines:")
|
||||
Opts.LogBuf.Write(stacks)
|
||||
}
|
||||
fmt.Fprintln(Opts.LogBuf)
|
||||
if buf, ok := Opts.LogBuf.(*bufio.Writer); ok {
|
||||
buf.Flush()
|
||||
}
|
||||
Opts.mu.Unlock()
|
||||
lo.mu.Unlock()
|
||||
Opts.OnPotentialDeadlock()
|
||||
<-ch
|
||||
return
|
||||
case <-ch:
|
||||
return
|
||||
}
|
||||
t.Reset(Opts.DeadlockTimeout)
|
||||
}
|
||||
}
|
||||
|
||||
type lockOrder struct {
|
||||
mu sync.Mutex
|
||||
cur map[interface{}]stackGID // stacktraces + gids for the locks currently taken.
|
||||
|
2
vendor/github.com/sasha-s/go-deadlock/test.sh
generated
vendored
2
vendor/github.com/sasha-s/go-deadlock/test.sh
generated
vendored
@ -4,7 +4,7 @@ set -e
|
||||
echo "" > coverage.txt
|
||||
|
||||
for d in $(go list ./...); do
|
||||
go test -coverprofile=profile.out -covermode=atomic "$d"
|
||||
go test -bench=. -coverprofile=profile.out -covermode=atomic "$d"
|
||||
if [ -f profile.out ]; then
|
||||
cat profile.out >> coverage.txt
|
||||
rm profile.out
|
||||
|
39
vendor/github.com/sasha-s/go-deadlock/trylock.go
generated
vendored
Normal file
39
vendor/github.com/sasha-s/go-deadlock/trylock.go
generated
vendored
Normal file
@ -0,0 +1,39 @@
|
||||
// +build go1.18
|
||||
|
||||
package deadlock
|
||||
|
||||
// TryLock tries to lock the mutex.
|
||||
// Returns false if the lock is already in use, true otherwise.
|
||||
func (m *Mutex) TryLock() bool {
|
||||
return trylock(m.mu.TryLock, m)
|
||||
}
|
||||
|
||||
// TryLock tries to lock rw for writing.
|
||||
// Returns false if the lock is already locked for reading or writing, true otherwise.
|
||||
func (m *RWMutex) TryLock() bool {
|
||||
return trylock(m.mu.TryLock, m)
|
||||
}
|
||||
|
||||
// TryRLock tries to lock rw for reading.
|
||||
// Returns false if the lock is already locked for writing, true otherwise.
|
||||
func (m *RWMutex) TryRLock() bool {
|
||||
return trylock(m.mu.TryRLock, m)
|
||||
}
|
||||
|
||||
// trylock can not deadlock, so there is no deadlock detection.
|
||||
// lock ordering is still supported by calling into preLock/postLock,
|
||||
// and in failed attempt into postUnlock to unroll the state added by preLock.
|
||||
func trylock(lockFn func() bool, ptr interface{}) bool {
|
||||
if Opts.Disable {
|
||||
return lockFn()
|
||||
}
|
||||
stack := callers(1)
|
||||
preLock(stack, ptr)
|
||||
ret := lockFn()
|
||||
if ret {
|
||||
postLock(stack, ptr)
|
||||
} else {
|
||||
postUnlock(ptr)
|
||||
}
|
||||
return ret
|
||||
}
|
Reference in New Issue
Block a user