Skip to content
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

fix: logout discover dead lock #1090

Merged
merged 1 commit into from
Apr 16, 2024
Merged

fix: logout discover dead lock #1090

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,5 @@ iOSInjectionProject/
**/xcshareddata/WorkspaceSettings.xcsettings

# End of https://www.toptal.com/developers/gitignore/api/swift,xcode,Cobjective-c,osx

.idea
2 changes: 0 additions & 2 deletions waku/v2/service/common_discovery_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ func (sp *CommonDiscoveryService) GetListeningChan() <-chan PeerData {
return sp.channel
}
func (sp *CommonDiscoveryService) PushToChan(data PeerData) bool {
sp.RLock()
defer sp.RUnlock()
if err := sp.ErrOnNotRunning(); err != nil {
return false
}
Expand Down
15 changes: 8 additions & 7 deletions waku/v2/service/common_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"
"sync"
"sync/atomic"
)

// this is common layout for all the services that require mutex protection and a guarantee that all running goroutines will be finished before stop finishes execution. This guarantee comes from waitGroup all one has to use CommonService.WaitGroup() in the goroutines that should finish by the end of stop function.
Expand All @@ -12,7 +13,7 @@ type CommonService struct {
cancel context.CancelFunc
ctx context.Context
wg sync.WaitGroup
started bool
started atomic.Bool
}

func NewCommonService() *CommonService {
Expand All @@ -28,13 +29,13 @@ func NewCommonService() *CommonService {
func (sp *CommonService) Start(ctx context.Context, fn func() error) error {
sp.Lock()
defer sp.Unlock()
if sp.started {
if sp.started.Load() {
return ErrAlreadyStarted
}
sp.started = true
sp.started.Store(true)
sp.ctx, sp.cancel = context.WithCancel(ctx)
if err := fn(); err != nil {
sp.started = false
sp.started.Store(false)
sp.cancel()
return err
}
Expand All @@ -48,18 +49,18 @@ var ErrNotStarted = errors.New("not started")
func (sp *CommonService) Stop(fn func()) {
sp.Lock()
defer sp.Unlock()
if !sp.started {
if !sp.started.Load() {
return
}
sp.cancel()
fn()
sp.wg.Wait()
sp.started = false
sp.started.Store(false)
}

// This is not a mutex protected function, it is up to the caller to use it in a mutex protected context
func (sp *CommonService) ErrOnNotRunning() error {
if !sp.started {
if !sp.started.Load() {
return ErrNotStarted
}
return nil
Expand Down
Loading