jyapayne/nim-faststreams
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add tests for delayed var-size writes

Browse source
This commit is contained in:
Zahary Karadjov 2020-05-25 11:33:56 +03:00
commit 5d7cad792f
No known key found for this signature in database
GPG key ID: C8936F8A3073D609
3 changed files with 169 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

6
faststreams/buffers.nim
View file

@ -151,9 +151,13 @@ proc setFauxEof*(buffers: PageBuffers, pos: Natural): Natural =
proc restoreEof*(buffers: PageBuffers, pos: Natural) =
buffers.fauxEofPos = pos
template allocWritablePage*(pageSize: Natural, writtenToParam: Natural = 0): auto =
PageRef(data: allocRef newString(pageSize),
writtenTo: writtenToParam)
func addWritablePage*(buffers: PageBuffers, pageSize: Natural): PageRef =
trackWrittenToEnd(buffers)
result = PageRef(data: allocRef newString(pageSize))
result = allocWritablePage(pageSize)
buffers.queue.addLast result
func getWritablePage*(buffers: PageBuffers,

26
faststreams/outputs.nim
View file

@ -379,6 +379,7 @@ proc delayVarSizeWrite*(s: OutputStream, maxSize: Natural): VarSizeWriteCursor =
startAddr = s.span.startAddr
endAddr = offset(startAddr, maxSize)
inc s.extCursorsCount
result = VarSizeWriteCursor WriteCursor(
stream: s,
span: PageSpan(startAddr: startAddr, endAddr: endAddr))
@ -387,14 +388,17 @@ proc delayVarSizeWrite*(s: OutputStream, maxSize: Natural): VarSizeWriteCursor =
s.span.startAddr = endAddr
else:
trackWrittenTo(s.buffers, s.span.startAddr)
let
nextPageSize = nextAlignedSize(maxSize, s.buffers.pageSize)
nextPage = s.buffers.addWritablePage(nextPageSize)
nextPage = allocWritablePage(nextPageSize, maxSize)
nextPageSpan = nextPage.fullSpan
cursorEndAddr = offset(nextPageSpan.startAddr, maxSize)
nextPage.consumedTo = -maxSize
s.buffers.queue.addLast nextPage
inc s.extCursorsCount
result = VarSizeWriteCursor WriteCursor(
stream: s,
span: PageSpan(startAddr: nextPageSpan.startAddr,
@ -402,7 +406,7 @@ proc delayVarSizeWrite*(s: OutputStream, maxSize: Natural): VarSizeWriteCursor =
s.span = PageSpan(startAddr: cursorEndAddr,
endAddr: nextPageSpan.endAddr)
s.spanEndPos += nextPageSize
s.spanEndPos += nextPageSize - runway
proc finalize*(cursor: var WriteCursor) =
fsAssert cursor.stream.extCursorsCount > 0
@ -419,15 +423,10 @@ proc finalWrite*(c: var VarSizeWriteCursor, data: openArray[byte]) =
let overestimatedBytes = cursor.span.len - data.len
fsAssert overestimatedBytes >= 0
WriteCursor(c).stream.spanEndPos -= overestimatedBytes
for page in items(cursor.stream.buffers.queue):
let baseAddr = page.allocationStart
if page.allocationEnd == cursor.span.endAddr:
# This is a page ending cursor
page.writtenTo = distance(baseAddr, cursor.span.startAddr) + data.len
copyMem(cursor.span.startAddr, unsafeAddr data[0], data.len)
finalize cursor
return
if cursor.span.startAddr == baseAddr:
# This is page starting cursor
page.consumedTo = overestimatedBytes
@ -435,6 +434,13 @@ proc finalWrite*(c: var VarSizeWriteCursor, data: openArray[byte]) =
finalize cursor
return
if page.readableEnd == cursor.span.endAddr:
# This is a page ending cursor
page.writtenTo = distance(baseAddr, cursor.span.startAddr) + data.len
copyMem(cursor.span.startAddr, unsafeAddr data[0], data.len)
finalize cursor
return
fsAssert false
proc tryMovingToNextPage(c: var WriteCursor) =