Changeset 199 in code for trunk

Timestamp:

Apr 1, 2020, 10:21:31 AM (5 years ago)

Author:

contact

Message:

Set network.conn in user goroutine

One step closed to removing that lock.

File:

• trunk/user.go (modified) (3 diffs)

trunk/user.go

@@ -78 +78 @@
                 }
 
-                net.lock.Lock()
-                net.conn = uc
-                net.lock.Unlock()
-
                 net.user.events <- eventUpstreamConnected{uc}
                 if err := uc.readMessages(net.user.events); err != nil {
@@ -88 +84 @@
                 uc.Close()
                 net.user.events <- eventUpstreamDisconnected{uc}
-
-                net.lock.Lock()
-                net.conn = nil
-                net.lock.Unlock()
         }
 }
@@ -177 +169 @@
                 case eventUpstreamConnected:
                         uc := e.uc
+
+                        uc.network.lock.Lock()
+                        uc.network.conn = uc
+                        uc.network.lock.Unlock()
+
                         uc.updateAway()
                 case eventUpstreamDisconnected:
                         uc := e.uc
+
+                        uc.network.lock.Lock()
+                        uc.network.conn = nil
+                        uc.network.lock.Unlock()
+
                         for _, log := range uc.logs {
                                 log.file.Close()
                         }
+
                         uc.endPendingLISTs(true)
                 case eventUpstreamMessage: