code.ivysaur.me/nmdc-ircfrontend
1
0
Fork 0
Code Issues 9 Pull Requests Releases 7 Wiki Activity

move mutex calls to outer function

Browse Source 
--HG--
branch : nmdc-ircfrontend
This commit is contained in:
. 2016-05-09 18:49:00 +12:00
parent 7bf832322d
commit 74e4f6cfa3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server.go
View File

@ -445,6 +445,10 @@ func (s *Server) handleRegisteredCommand(command string, args []string) {
// response first. Once we get that, it'll connect instantly // response first. Once we get that, it'll connect instantly
go func() { go func() {
<-time.After(WAIT_FOR_VERSION * time.Second) <-time.After(WAIT_FOR_VERSION * time.Second)
s.ClientStateLock.Lock()
defer s.ClientStateLock.Unlock()
s.maybeStartUpstream() s.maybeStartUpstream()
}() }()
@ -464,9 +468,6 @@ func (s *Server) handleRegisteredCommand(command string, args []string) {
} }
func (s *Server) maybeStartUpstream() { func (s *Server) maybeStartUpstream() {
s.ClientStateLock.Lock()
defer s.ClientStateLock.Unlock()
if s.clientState != CSJoined { if s.clientState != CSJoined {
// Join for the first time // Join for the first time
s.clientState = CSJoined s.clientState = CSJoined
@ -513,6 +514,9 @@ func (s *Server) SetClientSoftwareVersion(ver string) {
s.upstreamLauncher.Self.ClientVersion = version s.upstreamLauncher.Self.ClientVersion = version
s.recievedCtcpVersion = true s.recievedCtcpVersion = true
s.ClientStateLock.Lock()
defer s.ClientStateLock.Unlock()
if s.upstream != nil { if s.upstream != nil {
s.upstream.Hco.Self.ClientTag = tag s.upstream.Hco.Self.ClientTag = tag
s.upstream.Hco.Self.ClientVersion = version s.upstream.Hco.Self.ClientVersion = version
@ -520,6 +524,7 @@ func (s *Server) SetClientSoftwareVersion(ver string) {
} else { } else {
// Connected for the first time (order was CTCP VERSION --> JOIN) // Connected for the first time (order was CTCP VERSION --> JOIN)
s.maybeStartUpstream() s.maybeStartUpstream()
} }