predicate.Not

lshxf · Oct 11, 2016 · da9f1a8 · da9f1a8
1 parent f3a83c5
commit da9f1a8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/common/predicate/predicate.go b/common/predicate/predicate.go
@@ -23,3 +23,9 @@ func Any(predicates ...Predicate) Predicate {
 		return false
 	}
 }
+
+func Not(predicate Predicate) Predicate {
+	return func() bool {
+		return !predicate()
+	}
+}
diff --git a/transport/internet/kcp/connection.go b/transport/internet/kcp/connection.go
@@ -225,17 +225,21 @@ func NewConnection(conv uint16, writerCloser io.WriteCloser, local *net.UDPAddr,
 	conn.congestionControl = config.Congestion
 	conn.sendingWorker = NewSendingWorker(conn)
 
+	isTerminating := func() bool {
+		return conn.State().Is(StateTerminating, StateTerminated)
+	}
+	isTerminated := func() bool {
+		return conn.State() == StateTerminated
+	}
 	conn.dataUpdater = NewUpdater(
 		conn.interval,
-		predicate.Any(conn.sendingWorker.UpdateNecessary, conn.receivingWorker.UpdateNecessary),
-		func() bool {
-			return conn.State() == StateTerminated
-		},
+		predicate.All(predicate.Not(isTerminating), predicate.Any(conn.sendingWorker.UpdateNecessary, conn.receivingWorker.UpdateNecessary)),
+		isTerminating,
 		conn.updateTask)
 	conn.pingUpdater = NewUpdater(
 		5000, // 5 seconds
-		func() bool { return conn.State() != StateTerminated },
-		func() bool { return conn.State() == StateTerminated },
+		predicate.Not(isTerminated),
+		isTerminated,
 		conn.updateTask)
 	conn.pingUpdater.WakeUp()