logos-storage/nim-chronos
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-chronos.git synced 2026-01-12 18:33:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate usage of yield inside of streams.

Browse Source
This commit is contained in:
cheatfate 2019-07-05 13:19:04 +03:00
parent 4dbf4844ee
commit 45ca9e1184
No known key found for this signature in database
GPG Key ID: 46ADD633A7201F95
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
chronos/streams/asyncstream.nim
View File

@ -567,11 +567,12 @@ proc write*(wstream: AsyncStreamWriter, pbytes: pointer,
raise newAsyncStreamIncorrectError("Zero length message")
if isNil(wstream.wsource):
var resFut = write(wstream.tsource, pbytes, nbytes)
yield resFut
if resFut.failed():
raise newAsyncStreamWriteError(resFut.error)
if resFut.read() != nbytes:
var res: int
try:
res = await write(wstream.tsource, pbytes, nbytes)
except:
raise newAsyncStreamWriteError(getCurrentException())
if res != nbytes:
raise newAsyncStreamIncompleteError()
else:
if isNil(wstream.writerLoop):
@ -582,8 +583,9 @@ proc write*(wstream: AsyncStreamWriter, pbytes: pointer,
item.size = nbytes
item.future = newFuture[void]("async.stream.write(pointer)")
await wstream.queue.put(item)
yield item.future
if item.future.failed():
try:
await item.future
except:
raise newAsyncStreamWriteError(item.future.error)
proc write*(wstream: AsyncStreamWriter, sbytes: seq[byte],
@ -604,11 +606,12 @@ proc write*(wstream: AsyncStreamWriter, sbytes: seq[byte],
raise newAsyncStreamIncorrectError("Zero length message")
if isNil(wstream.wsource):
var resFut = write(wstream.tsource, sbytes, msglen)
yield resFut
if resFut.failed():
raise newAsyncStreamWriteError(resFut.error)
if resFut.read() != length:
var res: int
try:
res = await write(wstream.tsource, sbytes, msglen)
except:
raise newAsyncStreamWriteError(getCurrentException())
if res != length:
raise newAsyncStreamIncompleteError()
else:
if isNil(wstream.writerLoop):
@ -622,8 +625,9 @@ proc write*(wstream: AsyncStreamWriter, sbytes: seq[byte],
item.size = length
item.future = newFuture[void]("async.stream.write(seq)")
await wstream.queue.put(item)
yield item.future
if item.future.failed():
try:
await item.future
except:
raise newAsyncStreamWriteError(item.future.error)
proc write*(wstream: AsyncStreamWriter, sbytes: string,
@ -643,11 +647,12 @@ proc write*(wstream: AsyncStreamWriter, sbytes: string,
raise newAsyncStreamIncorrectError("Zero length message")
if isNil(wstream.wsource):
var resFut = write(wstream.tsource, sbytes, msglen)
yield resFut
if resFut.failed():
raise newAsyncStreamWriteError(resFut.error)
if resFut.read() != length:
var res: int
try:
res = await write(wstream.tsource, sbytes, msglen)
except:
raise newAsyncStreamWriteError(getCurrentException())
if res != length:
raise newAsyncStreamIncompleteError()
else:
if isNil(wstream.writerLoop):
@ -661,8 +666,9 @@ proc write*(wstream: AsyncStreamWriter, sbytes: string,
item.size = length
item.future = newFuture[void]("async.stream.write(string)")
await wstream.queue.put(item)
yield item.future
if item.future.failed():
try:
await item.future
except:
raise newAsyncStreamWriteError(item.future.error)
proc finish*(wstream: AsyncStreamWriter) {.async.} =
@ -678,8 +684,9 @@ proc finish*(wstream: AsyncStreamWriter) {.async.} =
item.size = 0
item.future = newFuture[void]("async.stream.finish")
await wstream.queue.put(item)
yield item.future
if item.future.failed():
try:
await item.future
except:
raise newAsyncStreamWriteError(item.future.error)
proc join*(rw: AsyncStreamRW): Future[void] =