iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

fix-races.

Browse Source
This commit is contained in:
Miroslav Šedivý 2022-02-14 17:41:47 +00:00
parent 89ba775a71
commit f32e7e7075
4 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/capture/screencast.go
View File

@ -26,6 +26,7 @@ type ScreencastManagerCtx struct {
pipelineMu sync.Mutex
image types.Sample
imageMu sync.Mutex
tickerStop chan struct{}
enabled bool
@ -101,6 +102,9 @@ func (manager *ScreencastManagerCtx) Image() ([]byte, error) {
return nil, err
}
manager.imageMu.Lock()
defer manager.imageMu.Unlock()
if manager.image.Data == nil {
return nil, errors.New("image data not found")
}
@ -156,30 +160,36 @@ func (manager *ScreencastManagerCtx) createPipeline() error {
manager.pipeline.Play()
// get first image
var ok bool
select {
case manager.image, ok = <-manager.pipeline.Sample:
case image, ok := <-manager.pipeline.Sample:
if !ok {
return errors.New("unable to get first image")
} else {
manager.imageMu.Lock()
manager.image = image
manager.imageMu.Unlock()
}
case <-time.After(1 * time.Second):
return errors.New("timeouted while waiting for first image")
}
manager.wg.Add(1)
pipeline := manager.pipeline
go func() {
manager.logger.Debug().Msg("started receiving images")
defer manager.wg.Done()
for {
image, ok := <-manager.pipeline.Sample
image, ok := <-pipeline.Sample
if !ok {
manager.logger.Debug().Msg("stopped receiving images")
return
}
manager.imageMu.Lock()
manager.image = image
manager.imageMu.Unlock()
}
}()

3
internal/capture/streamsink.go
View File

@ -219,13 +219,14 @@ func (manager *StreamSinkManagerCtx) createPipeline() error {
manager.pipeline.Play()
manager.wg.Add(1)
pipeline := manager.pipeline
go func() {
manager.logger.Debug().Msg("started emitting samples")
defer manager.wg.Done()
for {
sample, ok := <-manager.pipeline.Sample
sample, ok := <-pipeline.Sample
if !ok {
manager.logger.Debug().Msg("stopped emitting samples")
return

21
internal/webrtc/cursor/image.go
View File

@ -24,10 +24,12 @@ func NewImage(desktop types.DesktopManager) *ImageCtx {
type ImageCtx struct {
logger zerolog.Logger
desktop types.DesktopManager
emitMu sync.Mutex
listeners map[uintptr]*func(entry *ImageEntry)
cacheMu sync.Mutex
listenersMu sync.Mutex
cache map[uint64]*ImageEntry
cacheMu sync.Mutex
current *ImageEntry
maxSerial uint64
}
@ -46,9 +48,12 @@ func (manager *ImageCtx) Start() {
}
manager.current = entry
manager.listenersMu.Lock()
for _, emit := range manager.listeners {
(*emit)(entry)
}
manager.listenersMu.Unlock()
})
manager.logger.Info().Msg("starting")
@ -57,11 +62,11 @@ func (manager *ImageCtx) Start() {
func (manager *ImageCtx) Shutdown() {
manager.logger.Info().Msg("shutdown")
manager.emitMu.Lock()
manager.listenersMu.Lock()
for key := range manager.listeners {
delete(manager.listeners, key)
}
manager.emitMu.Unlock()
manager.listenersMu.Unlock()
}
func (manager *ImageCtx) GetCached(serial uint64) (*ImageEntry, error) {
@ -101,8 +106,8 @@ func (manager *ImageCtx) Get() (*ImageEntry, error) {
}
func (manager *ImageCtx) AddListener(listener *func(entry *ImageEntry)) {
manager.emitMu.Lock()
defer manager.emitMu.Unlock()
manager.listenersMu.Lock()
defer manager.listenersMu.Unlock()
if listener != nil {
ptr := reflect.ValueOf(listener).Pointer()
@ -111,8 +116,8 @@ func (manager *ImageCtx) AddListener(listener *func(entry *ImageEntry)) {
}
func (manager *ImageCtx) RemoveListener(listener *func(entry *ImageEntry)) {
manager.emitMu.Lock()
defer manager.emitMu.Unlock()
manager.listenersMu.Lock()
defer manager.listenersMu.Unlock()
if listener != nil {
ptr := reflect.ValueOf(listener).Pointer()

18
internal/webrtc/cursor/position.go
View File

@ -17,29 +17,33 @@ func NewPosition() *PositionCtx {
type PositionCtx struct {
logger zerolog.Logger
emitMu sync.Mutex
listeners map[uintptr]*func(x, y int)
listenersMu sync.Mutex
}
func (manager *PositionCtx) Shutdown() {
manager.logger.Info().Msg("shutdown")
manager.emitMu.Lock()
manager.listenersMu.Lock()
for key := range manager.listeners {
delete(manager.listeners, key)
}
manager.emitMu.Unlock()
manager.listenersMu.Unlock()
}
func (manager *PositionCtx) Set(x, y int) {
manager.listenersMu.Lock()
defer manager.listenersMu.Unlock()
for _, emit := range manager.listeners {
(*emit)(x, y)
}
}
func (manager *PositionCtx) AddListener(listener *func(x, y int)) {
manager.emitMu.Lock()
defer manager.emitMu.Unlock()
manager.listenersMu.Lock()
defer manager.listenersMu.Unlock()
if listener != nil {
ptr := reflect.ValueOf(listener).Pointer()
@ -48,8 +52,8 @@ func (manager *PositionCtx) AddListener(listener *func(x, y int)) {
}
func (manager *PositionCtx) RemoveListener(listener *func(x, y int)) {
manager.emitMu.Lock()
defer manager.emitMu.Unlock()
manager.listenersMu.Lock()
defer manager.listenersMu.Unlock()
if listener != nil {
ptr := reflect.ValueOf(listener).Pointer()