source: code/trunk/user.go@ 199

Last change on this file since 199 was 199, checked in by contact, 5 years ago

Set network.conn in user goroutine

One step closed to removing that lock.

File size: 5.3 KB
RevLine 
[101]1package soju
2
3import (
4 "sync"
5 "time"
[103]6
7 "gopkg.in/irc.v3"
[101]8)
9
[165]10type event interface{}
11
12type eventUpstreamMessage struct {
[103]13 msg *irc.Message
14 uc *upstreamConn
15}
16
[196]17type eventUpstreamConnected struct {
18 uc *upstreamConn
19}
20
[179]21type eventUpstreamDisconnected struct {
22 uc *upstreamConn
23}
24
[165]25type eventDownstreamMessage struct {
[103]26 msg *irc.Message
27 dc *downstreamConn
28}
29
[166]30type eventDownstreamConnected struct {
31 dc *downstreamConn
32}
33
[167]34type eventDownstreamDisconnected struct {
35 dc *downstreamConn
36}
37
[101]38type network struct {
39 Network
40 user *user
[143]41 ring *Ring
[131]42
43 lock sync.Mutex
44 conn *upstreamConn
45 history map[string]uint64
[101]46}
47
48func newNetwork(user *user, record *Network) *network {
49 return &network{
50 Network: *record,
51 user: user,
[143]52 ring: NewRing(user.srv.RingCap),
[131]53 history: make(map[string]uint64),
[101]54 }
55}
56
57func (net *network) run() {
58 var lastTry time.Time
59 for {
60 if dur := time.Now().Sub(lastTry); dur < retryConnectMinDelay {
61 delay := retryConnectMinDelay - dur
62 net.user.srv.Logger.Printf("waiting %v before trying to reconnect to %q", delay.Truncate(time.Second), net.Addr)
63 time.Sleep(delay)
64 }
65 lastTry = time.Now()
66
67 uc, err := connectToUpstream(net)
68 if err != nil {
69 net.user.srv.Logger.Printf("failed to connect to upstream server %q: %v", net.Addr, err)
70 continue
71 }
72
73 uc.register()
[197]74 if err := uc.runUntilRegistered(); err != nil {
75 uc.logger.Printf("failed to register: %v", err)
76 uc.Close()
77 continue
78 }
[101]79
[196]80 net.user.events <- eventUpstreamConnected{uc}
[165]81 if err := uc.readMessages(net.user.events); err != nil {
[101]82 uc.logger.Printf("failed to handle messages: %v", err)
83 }
84 uc.Close()
[179]85 net.user.events <- eventUpstreamDisconnected{uc}
[101]86 }
87}
88
[136]89func (net *network) upstream() *upstreamConn {
90 net.lock.Lock()
91 defer net.lock.Unlock()
92 return net.conn
93}
94
[101]95type user struct {
96 User
97 srv *Server
98
[165]99 events chan event
[103]100
[101]101 networks []*network
102 downstreamConns []*downstreamConn
[177]103
104 // LIST commands in progress
[179]105 pendingLISTs []pendingLIST
[101]106}
107
[177]108type pendingLIST struct {
109 downstreamID uint64
110 // list of per-upstream LIST commands not yet sent or completed
111 pendingCommands map[int64]*irc.Message
112}
113
[101]114func newUser(srv *Server, record *User) *user {
115 return &user{
[165]116 User: *record,
117 srv: srv,
118 events: make(chan event, 64),
[101]119 }
120}
121
122func (u *user) forEachNetwork(f func(*network)) {
123 for _, network := range u.networks {
124 f(network)
125 }
126}
127
128func (u *user) forEachUpstream(f func(uc *upstreamConn)) {
129 for _, network := range u.networks {
[136]130 uc := network.upstream()
[197]131 if uc == nil {
[101]132 continue
133 }
134 f(uc)
135 }
136}
137
138func (u *user) forEachDownstream(f func(dc *downstreamConn)) {
139 for _, dc := range u.downstreamConns {
140 f(dc)
141 }
142}
143
144func (u *user) getNetwork(name string) *network {
145 for _, network := range u.networks {
146 if network.Addr == name {
147 return network
148 }
149 }
150 return nil
151}
152
153func (u *user) run() {
154 networks, err := u.srv.db.ListNetworks(u.Username)
155 if err != nil {
156 u.srv.Logger.Printf("failed to list networks for user %q: %v", u.Username, err)
157 return
158 }
159
160 for _, record := range networks {
161 network := newNetwork(u, &record)
162 u.networks = append(u.networks, network)
163
164 go network.run()
165 }
[103]166
[165]167 for e := range u.events {
168 switch e := e.(type) {
[196]169 case eventUpstreamConnected:
[198]170 uc := e.uc
[199]171
172 uc.network.lock.Lock()
173 uc.network.conn = uc
174 uc.network.lock.Unlock()
175
[198]176 uc.updateAway()
[179]177 case eventUpstreamDisconnected:
178 uc := e.uc
[199]179
180 uc.network.lock.Lock()
181 uc.network.conn = nil
182 uc.network.lock.Unlock()
183
[179]184 for _, log := range uc.logs {
185 log.file.Close()
186 }
[199]187
[181]188 uc.endPendingLISTs(true)
[165]189 case eventUpstreamMessage:
190 msg, uc := e.msg, e.uc
[175]191 if uc.isClosed() {
[133]192 uc.logger.Printf("ignoring message on closed connection: %v", msg)
193 break
194 }
[103]195 if err := uc.handleMessage(msg); err != nil {
196 uc.logger.Printf("failed to handle message %q: %v", msg, err)
197 }
[166]198 case eventDownstreamConnected:
199 dc := e.dc
[168]200
201 if err := dc.welcome(); err != nil {
202 dc.logger.Printf("failed to handle new registered connection: %v", err)
203 break
204 }
205
[166]206 u.downstreamConns = append(u.downstreamConns, dc)
[198]207
208 u.forEachUpstream(func(uc *upstreamConn) {
209 uc.updateAway()
210 })
[167]211 case eventDownstreamDisconnected:
212 dc := e.dc
213 for i := range u.downstreamConns {
214 if u.downstreamConns[i] == dc {
215 u.downstreamConns = append(u.downstreamConns[:i], u.downstreamConns[i+1:]...)
216 break
217 }
218 }
[198]219
220 u.forEachUpstream(func(uc *upstreamConn) {
221 uc.updateAway()
222 })
[165]223 case eventDownstreamMessage:
224 msg, dc := e.msg, e.dc
[133]225 if dc.isClosed() {
226 dc.logger.Printf("ignoring message on closed connection: %v", msg)
227 break
228 }
[103]229 err := dc.handleMessage(msg)
230 if ircErr, ok := err.(ircError); ok {
231 ircErr.Message.Prefix = dc.srv.prefix()
232 dc.SendMessage(ircErr.Message)
233 } else if err != nil {
234 dc.logger.Printf("failed to handle message %q: %v", msg, err)
235 dc.Close()
236 }
[165]237 default:
238 u.srv.Logger.Printf("received unknown event type: %T", e)
[103]239 }
240 }
[101]241}
242
[120]243func (u *user) createNetwork(net *Network) (*network, error) {
[144]244 if net.ID != 0 {
245 panic("tried creating an already-existing network")
246 }
247
[120]248 network := newNetwork(u, net)
[101]249 err := u.srv.db.StoreNetwork(u.Username, &network.Network)
250 if err != nil {
251 return nil, err
252 }
[144]253
254 u.forEachDownstream(func(dc *downstreamConn) {
255 if dc.network == nil {
256 dc.runNetwork(network, false)
257 }
258 })
259
[101]260 u.networks = append(u.networks, network)
[144]261
[101]262 go network.run()
263 return network, nil
264}
Note: See TracBrowser for help on using the repository browser.