Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: Use TryLock for doclist operations and log lock failures #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 15, 2025
Merged

fix: Use TryLock for doclist operations and log lock failures #857

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions oviewer/doclist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package oviewer

import (
"context"
"log"
"slices"
"sync/atomic"
)
Expand Down Expand Up @@ -38,7 +39,10 @@ func (root *Root) hasDocChanged() bool {

// addDocument adds a document and displays it.
func (root *Root) addDocument(ctx context.Context, addDoc *Document) {
root.mu.Lock()
if !root.mu.TryLock() {
log.Print("failed to acquire lock")
return
}
root.DocList = append(root.DocList, addDoc)
root.mu.Unlock()

Expand All @@ -48,7 +52,10 @@ func (root *Root) addDocument(ctx context.Context, addDoc *Document) {

// insertDocument inserts a document after the specified number and displays it.
func (root *Root) insertDocument(ctx context.Context, num int, m *Document) {
root.mu.Lock()
if !root.mu.TryLock() {
log.Print("failed to acquire lock")
return
}
num = max(0, num)
num = min(len(root.DocList)-1, num)
root.DocList = append(root.DocList[:num+1], append([]*Document{m}, root.DocList[num+1:]...)...)
Expand All @@ -68,9 +75,10 @@ func (root *Root) closeDocument(ctx context.Context) {
return
}

root.setMessageLogf("close [%d]%s%s", root.CurrentDoc, root.Doc.FileName, root.Doc.Caption)

root.mu.Lock()
if !root.mu.TryLock() {
log.Print("failed to acquire lock")
return
}
num := root.CurrentDoc
root.DocList[num].requestClose()
root.DocList = slices.Delete(root.DocList, num, num+1)
Expand All @@ -80,11 +88,15 @@ func (root *Root) closeDocument(ctx context.Context) {
root.mu.Unlock()

root.setDocumentNum(ctx, num)
root.setMessageLogf("close [%d]%s%s", root.CurrentDoc, root.Doc.FileName, root.Doc.Caption)
}

// closeAllDocumentsOfType closes all documents of the specified type.
func (root *Root) closeAllDocumentsOfType(dType documentType) (int, []string) {
root.mu.Lock()
if !root.mu.TryLock() {
log.Print("failed to acquire lock")
return 0, nil
}
defer root.mu.Unlock()

docLen := len(root.DocList)
Expand Down
Loading