codex-storage
/
nim-chronos
mirror of https://github.com/codex-storage/nim-chronos.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix stream.nim write() GC functions.

This commit is contained in:
cheatfate 2018-06-15 15:09:44 +03:00
parent 0ca2cd8e5c
commit c102deac9d
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asyncdispatch2/transports/datagram.nim
View File

@ -572,7 +572,7 @@ proc send*(transp: DatagramTransport, msg: string, msglen = -1): Future[void] =
if not isLiteral(msg):
shallowCopy(retFuture.gcholder, msg)
let length = if msglen <= 0: len(msg) else: msglen
let vector = GramVector(kind: WithoutAddress, buf: unsafeAddr msg[0],
let vector = GramVector(kind: WithoutAddress, buf: addr retFuture.gcholder[0],
buflen: len(msg),
writer: cast[Future[void]](retFuture))
transp.queue.addLast(vector)
@ -589,7 +589,7 @@ proc send*[T](transp: DatagramTransport, msg: seq[T],
if not isLiteral(msg):
shallowCopy(retFuture.gcholder, msg)
let length = if msglen <= 0: (len(msg) * sizeof(T)) else: (msglen * sizeof(T))
let vector = GramVector(kind: WithoutAddress, buf: unsafeAddr msg[0],
let vector = GramVector(kind: WithoutAddress, buf: addr retFuture.gcholder[0],
buflen: length,
writer: cast[Future[void]](retFuture))
transp.queue.addLast(vector)
@ -619,7 +619,7 @@ proc sendTo*(transp: DatagramTransport, remote: TransportAddress,
if not isLiteral(msg):
shallowCopy(retFuture.gcholder, msg)
let length = if msglen <= 0: len(msg) else: msglen
let vector = GramVector(kind: WithAddress, buf: unsafeAddr msg[0],
let vector = GramVector(kind: WithAddress, buf: addr retFuture.gcholder[0],
buflen: length,
writer: cast[Future[void]](retFuture),
address: remote)
@ -637,7 +637,7 @@ proc sendTo*[T](transp: DatagramTransport, remote: TransportAddress,
if not isLiteral(msg):
shallowCopy(retFuture.gcholder, msg)
let length = if msglen <= 0: (len(msg) * sizeof(T)) else: (msglen * sizeof(T))
let vector = GramVector(kind: WithAddress, buf: unsafeAddr msg[0],
let vector = GramVector(kind: WithAddress, buf: addr retFuture.gcholder[0],
buflen: length,
writer: cast[Future[void]](retFuture),
address: remote)

18
asyncdispatch2/transports/stream.nim
View File

@ -881,28 +881,32 @@ proc write*(transp: StreamTransport, pbytes: pointer,
transp.resumeWrite()
return retFuture
proc write*(transp: StreamTransport, msg: var string): Future[int] =
proc write*(transp: StreamTransport, msg: string, msglen = -1): Future[int] =
## Write data from string ``msg`` using transport ``transp``.
var retFuture = FutureGCString[int]()
transp.checkClosed(retFuture)
shallowCopy(retFuture.gcholder, msg)
if not isLiteral(msg):
shallowCopy(retFuture.gcholder, msg)
let length = if msglen <= 0: len(msg) else: msglen
var vector = StreamVector(kind: DataBuffer,
writer: cast[Future[int]](retFuture),
buf: unsafeAddr msg[0], buflen: len(msg))
buf: addr retFuture.gcholder[0], buflen: length)
transp.queue.addLast(vector)
if WritePaused in transp.state:
transp.resumeWrite()
return retFuture
proc write*[T](transp: StreamTransport, msg: var seq[T]): Future[int] =
proc write*[T](transp: StreamTransport, msg: seq[T], msglen = -1): Future[int] =
## Write sequence ``msg`` using transport ``transp``.
var retFuture = FutureGCSeq[int, T]()
transp.checkClosed(retFuture)
shallowCopy(retFuture.gcholder, msg)
if not isLiteral(msg):
shallowCopy(retFuture.gcholder, msg)
let length = if msglen <= 0: (len(msg) * sizeof(T)) else: (msglen * sizeof(T))
var vector = StreamVector(kind: DataBuffer,
writer: cast[Future[int]](retFuture),
buf: unsafeAddr msg[0],
buflen: len(msg) * sizeof(T))
buf: addr retFuture.gcholder[0],
buflen: length)
transp.queue.addLast(vector)
if WritePaused in transp.state:
transp.resumeWrite()