jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make AVL tree node part of the memory regions; fixes hard to reproduce channel crashes

Browse source
This commit is contained in:
Araq 2017-01-31 13:08:23 +01:00
commit d59dd577f8
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/system/alloc.nim
View file

@ -103,19 +103,12 @@ type
root, deleted, last, freeAvlNodes: PAvlNode root, deleted, last, freeAvlNodes: PAvlNode
locked, blockChunkSizeIncrease: bool # if locked, we cannot free pages. locked, blockChunkSizeIncrease: bool # if locked, we cannot free pages.
nextChunkSize: int nextChunkSize: int
bottomData: AvlNode
{.deprecated: [TMemRegion: MemRegion].} {.deprecated: [TMemRegion: MemRegion].}
# shared:
var
bottomData {.threadvar.}: AvlNode
bottom {.threadvar.}: PAvlNode
{.push stack_trace: off.} {.push stack_trace: off.}
proc initAllocator() = proc initAllocator() = discard "nothing to do anymore"
when not defined(useNimRtl):
bottom = addr(bottomData)
bottom.link[0] = bottom
bottom.link[1] = bottom
{.pop.} {.pop.}
proc incCurrMem(a: var MemRegion, bytes: int) {.inline.} = proc incCurrMem(a: var MemRegion, bytes: int) {.inline.} =
@ -152,6 +145,12 @@ proc llAlloc(a: var MemRegion, size: int): pointer =
inc(a.llmem.acc, size) inc(a.llmem.acc, size)
zeroMem(result, size) zeroMem(result, size)
proc getBottom(a: var MemRegion): PAvlNode =
result = addr(a.bottomData)
if result.link[0] == nil:
result.link[0] = result
result.link[1] = result
proc allocAvlNode(a: var MemRegion, key, upperBound: int): PAvlNode = proc allocAvlNode(a: var MemRegion, key, upperBound: int): PAvlNode =
if a.freeAvlNodes != nil: if a.freeAvlNodes != nil:
result = a.freeAvlNodes result = a.freeAvlNodes
@ -162,12 +161,13 @@ proc allocAvlNode(a: var MemRegion, key, upperBound: int): PAvlNode =
cprintf("tracking location: %p\n", result) cprintf("tracking location: %p\n", result)
result.key = key result.key = key
result.upperBound = upperBound result.upperBound = upperBound
let bottom = getBottom(a)
result.link[0] = bottom result.link[0] = bottom
result.link[1] = bottom result.link[1] = bottom
result.level = 1 result.level = 1
when defined(avlcorruption): #when defined(avlcorruption):
track("allocAvlNode", result, sizeof(AvlNode)) # track("allocAvlNode", result, sizeof(AvlNode))
sysAssert(bottom == addr(bottomData), "bottom data") sysAssert(bottom == addr(a.bottomData), "bottom data")
sysAssert(bottom.link[0] == bottom, "bottom link[0]") sysAssert(bottom.link[0] == bottom, "bottom link[0]")
sysAssert(bottom.link[1] == bottom, "bottom link[1]") sysAssert(bottom.link[1] == bottom, "bottom link[1]")
@ -565,7 +565,7 @@ proc rawAlloc(a: var MemRegion, requestedSize: int): pointer =
sysAssert c.size == size, "rawAlloc 12" sysAssert c.size == size, "rawAlloc 12"
result = addr(c.data) result = addr(c.data)
sysAssert((cast[ByteAddress](result) and (MemAlign-1)) == 0, "rawAlloc 13") sysAssert((cast[ByteAddress](result) and (MemAlign-1)) == 0, "rawAlloc 13")
if a.root == nil: a.root = bottom if a.root == nil: a.root = getBottom(a)
add(a, a.root, cast[ByteAddress](result), cast[ByteAddress](result)+%size) add(a, a.root, cast[ByteAddress](result), cast[ByteAddress](result)+%size)
sysAssert(isAccessible(a, result), "rawAlloc 14") sysAssert(isAccessible(a, result), "rawAlloc 14")
sysAssert(allocInv(a), "rawAlloc: end") sysAssert(allocInv(a), "rawAlloc: end")
@ -613,7 +613,7 @@ proc rawDealloc(a: var MemRegion, p: pointer) =
when overwriteFree: c_memset(p, -1'i32, c.size -% bigChunkOverhead()) when overwriteFree: c_memset(p, -1'i32, c.size -% bigChunkOverhead())
# free big chunk # free big chunk
var c = cast[PBigChunk](c) var c = cast[PBigChunk](c)
a.deleted = bottom a.deleted = getBottom(a)
del(a, a.root, cast[int](addr(c.data))) del(a, a.root, cast[int](addr(c.data)))
freeBigChunk(a, c) freeBigChunk(a, c)
sysAssert(allocInv(a), "rawDealloc: end") sysAssert(allocInv(a), "rawDealloc: end")