Simplified reallocate() and more failed attempts at fixing GC issues
This commit is contained in:
parent
e09db61bc6
commit
1e29796278
|
@ -114,7 +114,7 @@ proc collect*(self: var PeonVM)
|
||||||
|
|
||||||
|
|
||||||
proc reallocate*(self: var PeonVM, p: pointer, oldSize: int, newSize: int): pointer =
|
proc reallocate*(self: var PeonVM, p: pointer, oldSize: int, newSize: int): pointer =
|
||||||
## Simple wrapper around realloc/dealloc with
|
## Simple wrapper around realloc with
|
||||||
## built-in garbage collection
|
## built-in garbage collection
|
||||||
self.gc.bytesAllocated.current += newSize - oldSize
|
self.gc.bytesAllocated.current += newSize - oldSize
|
||||||
try:
|
try:
|
||||||
|
@ -124,14 +124,7 @@ proc reallocate*(self: var PeonVM, p: pointer, oldSize: int, newSize: int): poin
|
||||||
echo &"DEBUG - Memory manager: Deallocating {oldSize} bytes of memory"
|
echo &"DEBUG - Memory manager: Deallocating {oldSize} bytes of memory"
|
||||||
else:
|
else:
|
||||||
echo "DEBUG - Memory manager: Deallocating 1 byte of memory"
|
echo "DEBUG - Memory manager: Deallocating 1 byte of memory"
|
||||||
dealloc(p)
|
|
||||||
elif (oldSize > 0 and not p.isNil() and newSize > oldSize) or oldSize == 0:
|
elif (oldSize > 0 and not p.isNil() and newSize > oldSize) or oldSize == 0:
|
||||||
self.gc.bytesAllocated.total += newSize - oldSize
|
|
||||||
when debugStressGC:
|
|
||||||
self.collect()
|
|
||||||
else:
|
|
||||||
if self.gc.bytesAllocated.current > self.gc.nextGC:
|
|
||||||
self.collect()
|
|
||||||
when debugMem:
|
when debugMem:
|
||||||
if oldSize == 0:
|
if oldSize == 0:
|
||||||
if newSize > 1:
|
if newSize > 1:
|
||||||
|
@ -140,18 +133,18 @@ proc reallocate*(self: var PeonVM, p: pointer, oldSize: int, newSize: int): poin
|
||||||
echo "DEBUG - Memory manager: Allocating 1 byte of memory"
|
echo "DEBUG - Memory manager: Allocating 1 byte of memory"
|
||||||
else:
|
else:
|
||||||
echo &"DEBUG - Memory manager: Resizing {oldSize} bytes of memory to {newSize} bytes"
|
echo &"DEBUG - Memory manager: Resizing {oldSize} bytes of memory to {newSize} bytes"
|
||||||
result = realloc(p, newSize)
|
self.gc.bytesAllocated.total += newSize - oldSize
|
||||||
when debugMem:
|
when debugStressGC:
|
||||||
if p.isNil() and newSize == 0:
|
self.collect()
|
||||||
echo &"DEBUG - Memory manager: Warning, asked to dealloc() nil pointer from {oldSize} to {newSize} bytes, ignoring request"
|
else:
|
||||||
elif oldSize > 0 and p.isNil():
|
if self.gc.bytesAllocated.current > self.gc.nextGC:
|
||||||
echo &"DEBUG - Memory manager: Warning, asked to realloc() nil pointer from {oldSize} to {newSize} bytes, ignoring request"
|
self.collect()
|
||||||
|
result = realloc(p, newSize)
|
||||||
except NilAccessDefect:
|
except NilAccessDefect:
|
||||||
stderr.write("Peon: could not manage memory, segmentation fault\n")
|
stderr.writeLine("Peon: could not manage memory, segmentation fault")
|
||||||
quit(139) # For now, there's not much we can do if we can't get the memory we need, so we exit
|
quit(139) # For now, there's not much we can do if we can't get the memory we need, so we exit
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template resizeArray*(self: var PeonVM, kind: untyped, p: pointer, oldCount, newCount: int): untyped =
|
template resizeArray*(self: var PeonVM, kind: untyped, p: pointer, oldCount, newCount: int): untyped =
|
||||||
## Handy template to resize a dynamic array
|
## Handy template to resize a dynamic array
|
||||||
cast[ptr UncheckedArray[kind]](reallocate(self, p, sizeof(kind) * oldCount, sizeof(kind) * newCount))
|
cast[ptr UncheckedArray[kind]](reallocate(self, p, sizeof(kind) * oldCount, sizeof(kind) * newCount))
|
||||||
|
@ -178,9 +171,9 @@ proc allocate*(self: var PeonVM, kind: ObjectKind, size: typedesc, count: int):
|
||||||
of String:
|
of String:
|
||||||
result.str = cast[ptr UncheckedArray[char]](self.reallocate(nil, 0, sizeof(size) * count))
|
result.str = cast[ptr UncheckedArray[char]](self.reallocate(nil, 0, sizeof(size) * count))
|
||||||
result.len = count
|
result.len = count
|
||||||
self.gc.bytesAllocated.current += sizeof(size) * count
|
|
||||||
else:
|
else:
|
||||||
discard # TODO
|
discard # TODO
|
||||||
|
self.gc.bytesAllocated.current += sizeof(size) * count
|
||||||
self.gc.objects.add(result)
|
self.gc.objects.add(result)
|
||||||
self.gc.pointers.incl(cast[uint64](result))
|
self.gc.pointers.incl(cast[uint64](result))
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ const debugSerializer* {.booldefine.} = false # Validate the bytecode serialize
|
||||||
const debugStressGC* {.booldefine.} = false # Make the GC run a collection at every allocation (VERY SLOW!)
|
const debugStressGC* {.booldefine.} = false # Make the GC run a collection at every allocation (VERY SLOW!)
|
||||||
const PeonBytecodeMarker* = "PEON_BYTECODE" # Magic value at the beginning of bytecode files
|
const PeonBytecodeMarker* = "PEON_BYTECODE" # Magic value at the beginning of bytecode files
|
||||||
const HeapGrowFactor* = 2 # The growth factor used by the GC to schedule the next collection
|
const HeapGrowFactor* = 2 # The growth factor used by the GC to schedule the next collection
|
||||||
const FirstGC* = 1024 * 1024; # How many bytes to allocate before running the first GC
|
const FirstGC* = 1024; # How many bytes to allocate before running the first GC
|
||||||
const enableVMChecks* {.booldefine.} = true; # Enables all types of compiler (nim-wise) checks in the VM
|
const enableVMChecks* {.booldefine.} = true; # Enables all types of compiler (nim-wise) checks in the VM
|
||||||
# List of paths where peon looks for modules, in order (empty path means current directory, which always takes precedence)
|
# List of paths where peon looks for modules, in order (empty path means current directory, which always takes precedence)
|
||||||
const moduleLookupPaths*: seq[string] = @["", "src/peon/stdlib"]
|
const moduleLookupPaths*: seq[string] = @["", "src/peon/stdlib"]
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
import std;
|
import std;
|
||||||
|
|
||||||
|
|
||||||
var x: uint64 = 1000000'u64;
|
var x = 10000;
|
||||||
var y = "just a test";
|
var y = "just a test";
|
||||||
print(y);
|
print(y);
|
||||||
print("Starting GC torture test");
|
print("Starting GC torture test");
|
||||||
print(x);
|
print(x);
|
||||||
while x > 0'u64 {
|
while x > 0 {
|
||||||
"hello";
|
"hello";
|
||||||
x = x - 1'u64;
|
x = x - 1;
|
||||||
}
|
}
|
||||||
print("END");
|
print("END");
|
||||||
print(y);
|
print(y);
|
||||||
|
|
Loading…
Reference in New Issue