Changeset 179 in code for trunk/upstream.go

Timestamp:

Mar 27, 2020, 11:51:58 PM (5 years ago)

Author:

contact

Message:

Introduce eventUpstreamDisconnected

This allows us to perform cleanup actions in the user goroutine. This
removes the need for pendingLISTsLock.

File:

• trunk/upstream.go (modified) (4 diffs)

trunk/upstream.go

@@ -64 +64 @@
 
         // set of LIST commands in progress, per downstream
-        // access is synchronized with user.pendingLISTsLock
         pendingLISTDownstreamSet map[uint64]struct{}
 
@@ -152 +151 @@
         }
         close(uc.closed)
-        for _, log := range uc.logs {
-                log.file.Close()
-        }
-        uc.endPendingLists(true)
         return nil
 }
@@ -193 +188 @@
 
 func (uc *upstreamConn) getPendingList() *pendingLIST {
-        uc.user.pendingLISTsLock.Lock()
-        defer uc.user.pendingLISTsLock.Unlock()
         for _, pl := range uc.user.pendingLISTs {
                 if _, ok := pl.pendingCommands[uc.network.ID]; !ok {
@@ -206 +199 @@
 func (uc *upstreamConn) endPendingLists(all bool) (found bool) {
         found = false
-        uc.user.pendingLISTsLock.Lock()
-        defer uc.user.pendingLISTsLock.Unlock()
         for i := 0; i < len(uc.user.pendingLISTs); i++ {
                 pl := uc.user.pendingLISTs[i]