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

Jump to bottom

Fix concurrent map write #449

Merged
merged 1 commit into from
Jul 7, 2021
Merged

Fix concurrent map write #449

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: 13 additions & 11 deletions acceptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type Acceptor struct {
dynamicQualifier bool
dynamicQualifierCount int
dynamicSessionChan chan *session
sessionAddr map[SessionID]net.Addr
sessionAddr sync.Map
sessionHostPort map[SessionID]int
listeners map[string]net.Listener
connectionValidator ConnectionValidator
Expand Down Expand Up @@ -89,13 +89,12 @@ func (a *Acceptor) Start() (err error) {
}
}

for sessionID := range a.sessions {
session := a.sessions[sessionID]
for _, s := range a.sessions {
a.sessionGroup.Add(1)
go func() {
session.run()
go func(s *session) {
s.run()
a.sessionGroup.Done()
}()
}(s)
}
if a.dynamicSessions {
a.dynamicSessionChan = make(chan *session)
Expand Down Expand Up @@ -133,8 +132,12 @@ func (a *Acceptor) Stop() {

//Get remote IP address for a given session.
func (a *Acceptor) RemoteAddr(sessionID SessionID) (net.Addr, bool) {
addr, ok := a.sessionAddr[sessionID]
return addr, ok
addr, ok := a.sessionAddr.Load(sessionID)
if !ok || addr == nil {
return nil, false
}
val, ok := addr.(net.Addr)
return val, ok
}

//NewAcceptor creates and initializes a new Acceptor.
Expand All @@ -145,7 +148,6 @@ func NewAcceptor(app Application, storeFactory MessageStoreFactory, settings *Se
settings: settings,
logFactory: logFactory,
sessions: make(map[SessionID]*session),
sessionAddr: make(map[SessionID]net.Addr),
sessionHostPort: make(map[SessionID]int),
listeners: make(map[string]net.Listener),
}
Expand Down Expand Up @@ -320,7 +322,7 @@ func (a *Acceptor) handleConnection(netConn net.Conn) {
defer session.stop()
}

a.sessionAddr[sessID] = netConn.RemoteAddr()
a.sessionAddr.Store(sessID, netConn.RemoteAddr())
msgIn := make(chan fixIn)
msgOut := make(chan []byte)

Expand Down Expand Up @@ -367,7 +369,7 @@ LOOP:
case id := <-complete:
session, ok := sessions[id]
if ok {
delete(a.sessionAddr, session.sessionID)
a.sessionAddr.Delete(session.sessionID)
delete(sessions, id)
} else {
a.globalLog.OnEventf("Missing dynamic session %v!", id)
Expand Down