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

Merge branch 'devel' into araq-fixes-7833

Browse source
This commit is contained in:
Araq 2018-08-04 15:52:34 +02:00
commit 9235f7a3b3
28 changed files with 399 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/system/alloc.nim
View file

@ -436,8 +436,9 @@ proc requestOsChunks(a: var MemRegion, size: int): PBigChunk =
a.nextChunkSize = PageSize*4
else:
a.nextChunkSize = min(roundup(usedMem shr 2, PageSize), a.nextChunkSize * 2)
var size = size
a.nextChunkSize = min(a.nextChunkSize, MaxBigChunkSize)
var size = size
if size > a.nextChunkSize:
result = cast[PBigChunk](osAllocPages(size))
else: