status-im/nim-libp2p
2
0
Fork 0
mirror of https://github.com/status-im/nim-libp2p.git synced 2025-01-11 05:26:02 +00:00
Code Issues Projects Releases Wiki Activity

use race instead of or to avoid lockup (#1042)

Browse Source
This commit is contained in:
Etan Kissling 2024-03-04 00:06:32 +01:00 committed by GitHub
parent 0b753e7cf2
commit 9059a8aced
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libp2p/muxers/yamux/yamux.nim
View File

@ -266,7 +266,9 @@ method readOnce*(
raise newLPStreamRemoteClosedError() raise newLPStreamRemoteClosedError()
if channel.recvQueue.len == 0: if channel.recvQueue.len == 0:
channel.receivedData.clear() channel.receivedData.clear()
await channel.closedRemotely or channel.receivedData.wait() try: # https://github.com/status-im/nim-chronos/issues/516
discard await race(channel.closedRemotely, channel.receivedData.wait())
except ValueError: raiseAssert("Futures list is not empty")
if channel.closedRemotely.done() and channel.recvQueue.len == 0: if channel.closedRemotely.done() and channel.recvQueue.len == 0:
channel.returnedEof = true channel.returnedEof = true
channel.isEof = true channel.isEof = true

4
libp2p/protocols/connectivity/relay/utils.nim
View File

@ -55,7 +55,9 @@ proc bridge*(connSrc: Connection, connDst: Connection) {.async.} =
try: try:
while not connSrc.closed() and not connDst.closed(): while not connSrc.closed() and not connDst.closed():
await futSrc or futDst try: # https://github.com/status-im/nim-chronos/issues/516
discard await race(futSrc, futDst)
except ValueError: raiseAssert("Futures list is not empty")
if futSrc.finished(): if futSrc.finished():
bufRead = await futSrc bufRead = await futSrc
if bufRead > 0: if bufRead > 0:

5
libp2p/protocols/secure/secure.nim
View File

@ -97,7 +97,10 @@ proc handleConn(s: Secure,
let let
fut1 = conn.join() fut1 = conn.join()
fut2 = sconn.join() fut2 = sconn.join()
await fut1 or fut2 # one join() completes, cancel outstanding join() try: # https://github.com/status-im/nim-chronos/issues/516
discard await race(fut1, fut2)
except ValueError: raiseAssert("Futures list is not empty")
# at least one join() completed, cancel pending one, if any
if not fut1.finished: await fut1.cancelAndWait() if not fut1.finished: await fut1.cancelAndWait()
if not fut2.finished: await fut2.cancelAndWait() if not fut2.finished: await fut2.cancelAndWait()
block: block:

5
libp2p/transports/tcptransport.nim
View File

@ -68,7 +68,10 @@ proc connHandler*(self: TcpTransport,
let let
fut1 = client.join() fut1 = client.join()
fut2 = conn.join() fut2 = conn.join()
await fut1 or fut2 # one join() completes, cancel outstanding join() try: # https://github.com/status-im/nim-chronos/issues/516
discard await race(fut1, fut2)
except ValueError: raiseAssert("Futures list is not empty")
# at least one join() completed, cancel pending one, if any
if not fut1.finished: await fut1.cancelAndWait() if not fut1.finished: await fut1.cancelAndWait()
if not fut2.finished: await fut2.cancelAndWait() if not fut2.finished: await fut2.cancelAndWait()