codex-storage/nim-libp2p
1
0
Fork 0
mirror of https://github.com/codex-storage/nim-libp2p.git synced 2025-01-12 20:14:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement timeout in mplex in order to read reliably close state

Browse Source
This commit is contained in:
Giovanni Petrantoni 2020-02-10 22:22:57 +09:00 committed by Dmitriy Ryajov
parent 20f65e0dc8
commit 4034dfae19
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libp2p/muxers/mplex/mplex.nim
View File

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