feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CmdBridge: Fix concurrent map access

Browse Source 
Change-Id: I180eb315c4e253550fcdda5506a30e95ff62fbee
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2024-10-11 08:35:57 +02:00
parent a90aa1b76f
commit b72fa7a32e
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libs/gocmdbridge/server/watcher.go
View File

@@ -3,6 +3,7 @@ package main
import (
"os"
"strings"
"sync"
"github.com/fsnotify/fsnotify"
"github.com/fxamacker/cbor/v2"
@@ -10,6 +11,7 @@ import (
type WatcherHandler struct {
watcher *fsnotify.Watcher
mutex sync.Mutex
watchList map[int]string
watchRefs map[string]int
}
@@ -33,13 +35,16 @@ type watchevent struct {
EventType int
}
func (watchHandler WatcherHandler) start(out chan<- []byte) {
func (watchHandler *WatcherHandler) start(out chan<- []byte) {
for {
select {
case event, ok := <-watchHandler.watcher.Events:
if !ok {
return
}
watchHandler.mutex.Lock()
defer watchHandler.mutex.Unlock()
// Find which watchList entries correspond to the event
for id, path := range watchHandler.watchList {
// See if the event path is a subpath of the watch path
@@ -79,13 +84,17 @@ type addwatchresult struct {
Result bool
}
func (watchHandler WatcherHandler) processAdd(cmd command, out chan<- []byte) {
func (watchHandler *WatcherHandler) processAdd(cmd command, out chan<- []byte) {
// TODO: Resolve links
err := watchHandler.watcher.Add(cmd.Path)
if err != nil {
sendError(out, cmd, err)
return
}
watchHandler.mutex.Lock()
defer watchHandler.mutex.Unlock()
watchHandler.watchList[cmd.Id] = cmd.Path
watchHandler.watchRefs[cmd.Path]++
data, _ := cbor.Marshal(addwatchresult{
@@ -97,7 +106,10 @@ func (watchHandler WatcherHandler) processAdd(cmd command, out chan<- []byte) {
out <- data
}
func (watchHandler WatcherHandler) processStop(cmd command, out chan<- []byte) {
func (watchHandler *WatcherHandler) processStop(cmd command, out chan<- []byte) {
watchHandler.mutex.Lock()
defer watchHandler.mutex.Unlock()
path, ok := watchHandler.watchList[cmd.Id]
if !ok {
sendError(out, cmd, &watchnotfounderror{})
@@ -140,7 +152,10 @@ func (e *watchnotfounderror) Error() string {
return "Watch not found"
}
func (watchHandler WatcherHandler) processRemove(cmd command, out chan<- []byte) {
func (watchHandler *WatcherHandler) processRemove(cmd command, out chan<- []byte) {
watchHandler.mutex.Lock()
defer watchHandler.mutex.Unlock()
if _, ok := watchHandler.watchList[cmd.Id]; !ok {
sendError(out, cmd, &watchnotfounderror{})
return