Skip to content

guard vfsMap with a mutex #19

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

Open
maxencehenneron wants to merge 1 commit into
base: main
Choose a base branch
from
Open

guard vfsMap with a mutex #19

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
8 changes: 7 additions & 1 deletion sqlite3vfscgo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
)

var (
vfsMux sync.RWMutex
vfsMap = make(map[string]ExtendedVFSv1)

fileMux sync.Mutex
Expand All @@ -23,7 +24,9 @@ var (
)

func newVFS(name string, goVFS ExtendedVFSv1, maxPathName int) error {
vfsMux.Lock()
vfsMap[name] = goVFS
vfsMux.Unlock()

rc := C.s3vfsNew(C.CString(name), C.int(maxPathName))
if rc == C.SQLITE_OK {
Expand Down Expand Up @@ -495,7 +498,10 @@ func goVFSFileControl(cfile *C.sqlite3_file, op C.int, pArg unsafe.Pointer) C.in

func vfsFromC(cvfs *C.sqlite3_vfs) ExtendedVFSv1 {
vfsName := C.GoString(cvfs.zName)
return vfsMap[vfsName]
vfsMux.RLock()
vfs := vfsMap[vfsName]
vfsMux.RUnlock()
return vfs
}

func errToC(err error) C.int {
Expand Down