Changeset 311 in code for trunk

Timestamp:

Jun 3, 2020, 3:28:31 PM (5 years ago)

Author:

contact

Message:

Introduce network.isClosed

File:

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

trunk/user.go

@@ -89 +89 @@
 }
 
+func (net *network) isStopped() bool {
+        select {
+        case <-net.stopped:
+                return true
+        default:
+                return false
+        }
+}
+
 func (net *network) run() {
         var lastTry time.Time
         for {
-                select {
-                case <-net.stopped:
+                if net.isStopped() {
                         return
-                default:
-                        // This space is intentionally left blank
                 }
 
@@ -121 +127 @@
                 }
 
+                // TODO: this is racy with net.stopped. If the network is stopped
+                // before the user goroutine receives eventUpstreamConnected, the
+                // connection won't be closed.
                 net.user.events <- eventUpstreamConnected{uc}
                 if err := uc.readMessages(net.user.events); err != nil {
@@ -132 +141 @@
 
 func (net *network) stop() {
-        select {
-        case <-net.stopped:
-                return
-        default:
+        if !net.isStopped() {
                 close(net.stopped)
         }