Revert "Implement timeout in mplex in order to read reliably close state"

This reverts commit 314cb6e6bffe122bcfbd155a4ef830849ace66ef.
This commit is contained in:
Giovanni Petrantoni 2020-02-12 17:29:21 +09:00 committed by Dmitriy Ryajov
parent 11bd55308f
commit 39dc9ad8a3
1 changed files with 2 additions and 9 deletions

View File

@ -23,8 +23,6 @@ import ../muxer,
logScope:
topic = "Mplex"
const HandleTimeout = 30.seconds
type
Mplex* = ref object of Muxer
remote*: Table[uint, LPChannel]
@ -61,20 +59,15 @@ proc cleanupChann(m: Mplex, chann: LPChannel, initiator: bool) {.async, inline.}
m.getChannelList(initiator).del(chann.id)
trace "cleaned up channel", id = chann.id
proc messageTimeout(t: Duration): Future[Option[Msg]] {.async, inline.} =
await sleepAsync(t)
return Msg.none
method handle*(m: Mplex) {.async, gcsafe.} =
trace "starting mplex main loop"
try:
while not m.connection.closed:
trace "waiting for data"
let
res = await one(m.connection.readMsg(), messageTimeout(HandleTimeout))
msg = res.read()
let msg = await m.connection.readMsg()
if msg.isNone:
trace "connection EOF"
# TODO: allow poll with timeout to avoid using `sleepAsync`
await sleepAsync(1.millis)
continue