github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

predicate.Not

pull/314/head
Darien Raymond 2016-10-11 12:30:53 +02:00
parent f3a83c57ab
commit da9f1a8013
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/predicate/predicate.go
View File

@ -23,3 +23,9 @@ func Any(predicates ...Predicate) Predicate {
return false return false
} }
} }
func Not(predicate Predicate) Predicate {
return func() bool {
return !predicate()
}
}

16
transport/internet/kcp/connection.go
View File

@ -225,17 +225,21 @@ func NewConnection(conv uint16, writerCloser io.WriteCloser, local *net.UDPAddr,
conn.congestionControl = config.Congestion conn.congestionControl = config.Congestion
conn.sendingWorker = NewSendingWorker(conn) conn.sendingWorker = NewSendingWorker(conn)
isTerminating := func() bool {
return conn.State().Is(StateTerminating, StateTerminated)
}
isTerminated := func() bool {
return conn.State() == StateTerminated
}
conn.dataUpdater = NewUpdater( conn.dataUpdater = NewUpdater(
conn.interval, conn.interval,
predicate.Any(conn.sendingWorker.UpdateNecessary, conn.receivingWorker.UpdateNecessary), predicate.All(predicate.Not(isTerminating), predicate.Any(conn.sendingWorker.UpdateNecessary, conn.receivingWorker.UpdateNecessary)),
func() bool { isTerminating,
return conn.State() == StateTerminated
},
conn.updateTask) conn.updateTask)
conn.pingUpdater = NewUpdater( conn.pingUpdater = NewUpdater(
5000, // 5 seconds 5000, // 5 seconds
func() bool { return conn.State() != StateTerminated }, predicate.Not(isTerminated),
func() bool { return conn.State() == StateTerminated }, isTerminated,
conn.updateTask) conn.updateTask)
conn.pingUpdater.WakeUp() conn.pingUpdater.WakeUp()