oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-02 17:18:31 +00:00
Code Wiki Activity

Refactor bunched remote command

Browse source
This commit is contained in:
Kane York 2015-11-02 22:59:38 -08:00
parent 013e49e2c5
commit db486e4eba
2 changed files with 40 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

96
socketserver/internal/server/commands.go
View file

@ -356,7 +356,7 @@ type BunchSubscriberList struct {
}
var PendingBunchedRequests map[BunchedRequest]*BunchSubscriberList = make(map[BunchedRequest]*BunchSubscriberList)
var PendingBunchLock sync.RWMutex
var PendingBunchLock sync.Mutex
var CompletedBunchedRequests map[BunchedRequest]BunchedResponse = make(map[BunchedRequest]BunchedResponse)
var CompletedBunchLock sync.RWMutex
@ -374,16 +374,16 @@ func bunchingJanitor() {
}
}
func HandleBunchedRemotecommand(conn *websocket.Conn, client *ClientInfo, msg ClientMessage) (rmsg ClientMessage, err error) {
func HandleBunchedRemoteCommand(conn *websocket.Conn, client *ClientInfo, msg ClientMessage) (rmsg ClientMessage, err error) {
br := BunchedRequestFromCM(&msg)
CompletedBunchLock.RLock()
resp, ok := CompletedBunchedRequests[br]
CompletedBunchLock.RUnlock()
if ok && resp.Timestamp.After(time.Now().Add(-5*time.Minute)) {
CompletedBunchLock.RUnlock()
return SuccessMessageFromString(resp.Response), nil
} else if ok {
CompletedBunchLock.RUnlock()
// Entry expired, let's remove it...
CompletedBunchLock.Lock()
@ -393,74 +393,54 @@ func HandleBunchedRemotecommand(conn *websocket.Conn, client *ClientInfo, msg Cl
delete(CompletedBunchedRequests, br)
}
CompletedBunchLock.Unlock()
} else {
CompletedBunchLock.RUnlock()
}
client.MsgChannelKeepalive.Add(1)
PendingBunchLock.RLock()
PendingBunchLock.Lock()
list, ok := PendingBunchedRequests[br]
var needToStart bool
if ok {
list.Lock()
AddToSliceB(&list.Members, client, msg.MessageID)
list.Unlock()
PendingBunchLock.RUnlock()
PendingBunchLock.Unlock()
client.MsgChannelKeepalive.Add(1)
return ClientMessage{Command: AsyncResponseCommand}, nil
} else {
PendingBunchLock.RUnlock()
PendingBunchLock.Lock()
// RECHECK because someone else might have added it
list, ok = PendingBunchedRequests[br]
if ok {
list.Lock()
AddToSliceB(&list.Members, client, msg.MessageID)
list.Unlock()
PendingBunchLock.Unlock()
return ClientMessage{Command: AsyncResponseCommand}, nil
}
PendingBunchedRequests[br] = &BunchSubscriberList{Members: []BunchSubscriber{{Client: client, MessageID: msg.MessageID}}}
PendingBunchLock.Unlock()
client.MsgChannelKeepalive.Add(1)
go func(request BunchedRequest) {
resp, err := RequestRemoteDataCached(string(request.Command), request.Param, AuthInfo{})
PendingBunchLock.Lock() // Prevent new signups
var msg ClientMessage
if err == nil {
CompletedBunchLock.Lock() // mutex on map
CompletedBunchedRequests[request] = BunchedResponse{Response: resp, Timestamp: time.Now()}
CompletedBunchLock.Unlock()
msg = SuccessMessageFromString(resp)
} else {
PendingBunchedRequests[br] = &BunchSubscriberList{Members: []BunchSubscriber{{Client: client, MessageID: msg.MessageID}}}
needToStart = true
PendingBunchLock.Unlock()
msg.Command = ErrorCommand
msg.Arguments = err.Error()
}
}
if needToStart {
go func(request BunchedRequest) {
resp, err := RequestRemoteDataCached(string(request.Command), request.Param, AuthInfo{})
bsl := PendingBunchedRequests[request]
bsl.Lock()
for _, member := range bsl.Members {
msg.MessageID = member.MessageID
member.Client.MessageChannel <- msg
member.Client.MsgChannelKeepalive.Done()
}
bsl.Unlock()
PendingBunchLock.Lock() // Prevent new signups
var msg ClientMessage
if err == nil {
CompletedBunchLock.Lock() // mutex on map
CompletedBunchedRequests[request] = BunchedResponse{Response: resp, Timestamp: time.Now()}
CompletedBunchLock.Unlock()
delete(PendingBunchedRequests, request)
PendingBunchLock.Unlock()
}(br)
msg = SuccessMessageFromString(resp)
} else {
msg.Command = ErrorCommand
msg.Arguments = err.Error()
}
bsl := PendingBunchedRequests[request]
bsl.Lock()
for _, member := range bsl.Members {
msg.MessageID = member.MessageID
member.Client.MessageChannel <- msg
member.Client.MsgChannelKeepalive.Done()
}
bsl.Unlock()
delete(PendingBunchedRequests, request)
PendingBunchLock.Unlock()
}(br)
return ClientMessage{Command: AsyncResponseCommand}, nil
} else {
panic("logic error")
}
return ClientMessage{Command: AsyncResponseCommand}, nil
}
func HandleRemoteCommand(conn *websocket.Conn, client *ClientInfo, msg ClientMessage) (rmsg ClientMessage, err error) {