mirror of
https://github.com/CPunch/Cosmo.git
synced 2024-11-22 15:30:06 +00:00
fix more GC bugs
This commit is contained in:
parent
6ed5589513
commit
1ae473383d
@ -27,9 +27,9 @@ void initChunk(CState *state, CChunk *chunk, size_t startCapacity)
|
|||||||
void cleanChunk(CState *state, CChunk *chunk)
|
void cleanChunk(CState *state, CChunk *chunk)
|
||||||
{
|
{
|
||||||
// first, free the chunk buffer
|
// first, free the chunk buffer
|
||||||
cosmoM_freearray(state, INSTRUCTION, chunk->buf, chunk->capacity);
|
cosmoM_freeArray(state, INSTRUCTION, chunk->buf, chunk->capacity);
|
||||||
// then the line info
|
// then the line info
|
||||||
cosmoM_freearray(state, int, chunk->lineInfo, chunk->capacity);
|
cosmoM_freeArray(state, int, chunk->lineInfo, chunk->capacity);
|
||||||
// free the constants
|
// free the constants
|
||||||
cleanValArray(state, &chunk->constants);
|
cleanValArray(state, &chunk->constants);
|
||||||
}
|
}
|
||||||
@ -61,8 +61,8 @@ int addConstant(CState *state, CChunk *chunk, CValue value)
|
|||||||
void writeu8Chunk(CState *state, CChunk *chunk, INSTRUCTION i, int line)
|
void writeu8Chunk(CState *state, CChunk *chunk, INSTRUCTION i, int line)
|
||||||
{
|
{
|
||||||
// does the buffer need to be reallocated?
|
// does the buffer need to be reallocated?
|
||||||
cosmoM_growarray(state, INSTRUCTION, chunk->buf, chunk->count, chunk->capacity);
|
cosmoM_growArray(state, INSTRUCTION, chunk->buf, chunk->count, chunk->capacity);
|
||||||
cosmoM_growarray(state, int, chunk->lineInfo, chunk->count, chunk->lineCapacity);
|
cosmoM_growArray(state, int, chunk->lineInfo, chunk->count, chunk->lineCapacity);
|
||||||
|
|
||||||
// write data to the chunk :)
|
// write data to the chunk :)
|
||||||
chunk->lineInfo[chunk->count] = line;
|
chunk->lineInfo[chunk->count] = line;
|
||||||
|
@ -54,7 +54,7 @@ static void resetBuffer(CLexState *state)
|
|||||||
// cancels the token heap buffer and frees it
|
// cancels the token heap buffer and frees it
|
||||||
static void freeBuffer(CLexState *state)
|
static void freeBuffer(CLexState *state)
|
||||||
{
|
{
|
||||||
cosmoM_freearray(state->cstate, char, state->buffer, state->bufCap);
|
cosmoM_freeArray(state->cstate, char, state->buffer, state->bufCap);
|
||||||
|
|
||||||
resetBuffer(state);
|
resetBuffer(state);
|
||||||
}
|
}
|
||||||
@ -62,7 +62,7 @@ static void freeBuffer(CLexState *state)
|
|||||||
// adds character to buffer
|
// adds character to buffer
|
||||||
static void appendBuffer(CLexState *state, char c)
|
static void appendBuffer(CLexState *state, char c)
|
||||||
{
|
{
|
||||||
cosmoM_growarray(state->cstate, char, state->buffer, state->bufCount, state->bufCap);
|
cosmoM_growArray(state->cstate, char, state->buffer, state->bufCount, state->bufCap);
|
||||||
|
|
||||||
state->buffer[state->bufCount++] = c;
|
state->buffer[state->bufCount++] = c;
|
||||||
}
|
}
|
||||||
@ -90,7 +90,7 @@ static char *cutBuffer(CLexState *state, int *length)
|
|||||||
resetBuffer(state);
|
resetBuffer(state);
|
||||||
|
|
||||||
// shrink the buffer to only use what we need
|
// shrink the buffer to only use what we need
|
||||||
return cosmoM_reallocate(state->cstate, buf, cap, count);
|
return cosmoM_reallocate(state->cstate, buf, cap, count, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
static CToken makeToken(CLexState *state, CTokenType type)
|
static CToken makeToken(CLexState *state, CTokenType type)
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
#include "cvalue.h"
|
#include "cvalue.h"
|
||||||
|
|
||||||
// realloc wrapper
|
// realloc wrapper
|
||||||
void *cosmoM_reallocate(CState *state, void *buf, size_t oldSize, size_t newSize)
|
void *cosmoM_reallocate(CState *state, void *buf, size_t oldSize, size_t newSize, bool isGC)
|
||||||
{
|
{
|
||||||
if (buf == NULL)
|
if (buf == NULL)
|
||||||
oldSize = 0;
|
oldSize = 0;
|
||||||
@ -34,6 +34,7 @@ void *cosmoM_reallocate(CState *state, void *buf, size_t oldSize, size_t newSize
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isGC) {
|
||||||
#ifdef GC_STRESS
|
#ifdef GC_STRESS
|
||||||
if (!(cosmoM_isFrozen(state)) && newSize > oldSize) {
|
if (!(cosmoM_isFrozen(state)) && newSize > oldSize) {
|
||||||
cosmoM_collectGarbage(state);
|
cosmoM_collectGarbage(state);
|
||||||
@ -46,6 +47,7 @@ void *cosmoM_reallocate(CState *state, void *buf, size_t oldSize, size_t newSize
|
|||||||
#else
|
#else
|
||||||
cosmoM_checkGarbage(state, 0);
|
cosmoM_checkGarbage(state, 0);
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
// if NULL is passed, realloc() acts like malloc()
|
// if NULL is passed, realloc() acts like malloc()
|
||||||
void *newBuf = realloc(buf, newSize);
|
void *newBuf = realloc(buf, newSize);
|
||||||
@ -206,7 +208,7 @@ static void markObject(CState *state, CObj *obj)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
// we can use cosmoM_growarray because we lock the GC when we entered in cosmoM_collectGarbage
|
// we can use cosmoM_growarray because we lock the GC when we entered in cosmoM_collectGarbage
|
||||||
cosmoM_growarray(state, CObj *, state->grayStack.array, state->grayStack.count,
|
cosmoM_growArrayNonGC(state, CObj *, state->grayStack.array, state->grayStack.count,
|
||||||
state->grayStack.capacity);
|
state->grayStack.capacity);
|
||||||
|
|
||||||
state->grayStack.array[state->grayStack.count++] = obj;
|
state->grayStack.array[state->grayStack.count++] = obj;
|
||||||
|
33
src/cmem.h
33
src/cmem.h
@ -12,28 +12,37 @@
|
|||||||
#define ARRAY_START 8
|
#define ARRAY_START 8
|
||||||
|
|
||||||
#ifdef GC_DEBUG
|
#ifdef GC_DEBUG
|
||||||
# define cosmoM_freearray(state, type, buf, capacity) \
|
# define cosmoM_freeArray(state, type, buf, capacity) \
|
||||||
printf("freeing array %p [size %lu] at %s:%d\n", buf, sizeof(type) * capacity, __FILE__, \
|
printf("freeing array %p [size %lu] at %s:%d\n", buf, sizeof(type) * capacity, __FILE__, \
|
||||||
__LINE__); \
|
__LINE__); \
|
||||||
cosmoM_reallocate(state, buf, sizeof(type) * capacity, 0)
|
cosmoM_reallocate(state, buf, sizeof(type) * capacity, 0, true)
|
||||||
#else
|
#else
|
||||||
# define cosmoM_freearray(state, type, buf, capacity) \
|
# define cosmoM_freeArray(state, type, buf, capacity) \
|
||||||
cosmoM_reallocate(state, buf, sizeof(type) * capacity, 0)
|
cosmoM_reallocate(state, buf, sizeof(type) * capacity, 0, true)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define cosmoM_growarray(state, type, buf, count, capacity) \
|
#define cosmoM_growArray(state, type, buf, count, capacity) \
|
||||||
if (count >= capacity || buf == NULL) { \
|
if (count >= capacity || buf == NULL) { \
|
||||||
int old = capacity; \
|
int old = capacity; \
|
||||||
capacity = old * GROW_FACTOR; \
|
capacity = old * GROW_FACTOR; \
|
||||||
buf = (type *)cosmoM_reallocate(state, buf, sizeof(type) * old, sizeof(type) * capacity); \
|
buf = (type *)cosmoM_reallocate(state, buf, sizeof(type) * old, sizeof(type) * capacity, \
|
||||||
|
true); \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define cosmoM_growArrayNonGC(state, type, buf, count, capacity) \
|
||||||
|
if (count >= capacity || buf == NULL) { \
|
||||||
|
int old = capacity; \
|
||||||
|
capacity = old * GROW_FACTOR; \
|
||||||
|
buf = (type *)cosmoM_reallocate(state, buf, sizeof(type) * old, sizeof(type) * capacity, \
|
||||||
|
false); \
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef GC_DEBUG
|
#ifdef GC_DEBUG
|
||||||
# define cosmoM_free(state, type, x) \
|
# define cosmoM_free(state, type, x) \
|
||||||
printf("freeing %p [size %lu] at %s:%d\n", x, sizeof(type), __FILE__, __LINE__); \
|
printf("freeing %p [size %lu] at %s:%d\n", x, sizeof(type), __FILE__, __LINE__); \
|
||||||
cosmoM_reallocate(state, x, sizeof(type), 0)
|
cosmoM_reallocate(state, x, sizeof(type), 0, true)
|
||||||
#else
|
#else
|
||||||
# define cosmoM_free(state, type, x) cosmoM_reallocate(state, x, sizeof(type), 0)
|
# define cosmoM_free(state, type, x) cosmoM_reallocate(state, x, sizeof(type), 0, true)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define cosmoM_isFrozen(state) (state->freezeGC > 0)
|
#define cosmoM_isFrozen(state) (state->freezeGC > 0)
|
||||||
@ -60,7 +69,8 @@
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
COSMO_API void *cosmoM_reallocate(CState *state, void *buf, size_t oldSize, size_t newSize);
|
COSMO_API void *cosmoM_reallocate(CState *state, void *buf, size_t oldSize, size_t newSize,
|
||||||
|
bool isGC);
|
||||||
COSMO_API bool cosmoM_checkGarbage(CState *state,
|
COSMO_API bool cosmoM_checkGarbage(CState *state,
|
||||||
size_t needed); // returns true if GC event was triggered
|
size_t needed); // returns true if GC event was triggered
|
||||||
COSMO_API void cosmoM_collectGarbage(CState *state);
|
COSMO_API void cosmoM_collectGarbage(CState *state);
|
||||||
@ -76,10 +86,7 @@ COSMO_API void cosmoM_removeRoot(CState *state, CObj *oldRoot);
|
|||||||
// wrapper for cosmoM_reallocate so we can track our memory usage
|
// wrapper for cosmoM_reallocate so we can track our memory usage
|
||||||
static inline void *cosmoM_xmalloc(CState *state, size_t sz)
|
static inline void *cosmoM_xmalloc(CState *state, size_t sz)
|
||||||
{
|
{
|
||||||
return cosmoM_reallocate(state, NULL, 0, sz);
|
return cosmoM_reallocate(state, NULL, 0, sz, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// #define cosmoM_xmalloc(state, sz) \
|
|
||||||
// (printf("allocating new buffer at %s:%d of size %ld\n", __FILE__, __LINE__, sz), cosmoM_reallocate(state, NULL, 0, sz))
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -46,7 +46,7 @@ void cosmoO_free(CState *state, CObj *obj)
|
|||||||
switch (obj->type) {
|
switch (obj->type) {
|
||||||
case COBJ_STRING: {
|
case COBJ_STRING: {
|
||||||
CObjString *objStr = (CObjString *)obj;
|
CObjString *objStr = (CObjString *)obj;
|
||||||
cosmoM_freearray(state, char, objStr->str, objStr->length + 1);
|
cosmoM_freeArray(state, char, objStr->str, objStr->length + 1);
|
||||||
cosmoM_free(state, CObjString, objStr);
|
cosmoM_free(state, CObjString, objStr);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -82,13 +82,13 @@ void cosmoO_free(CState *state, CObj *obj)
|
|||||||
}
|
}
|
||||||
case COBJ_ERROR: {
|
case COBJ_ERROR: {
|
||||||
CObjError *err = (CObjError *)obj;
|
CObjError *err = (CObjError *)obj;
|
||||||
cosmoM_freearray(state, CCallFrame, err->frames, err->frameCount);
|
cosmoM_freeArray(state, CCallFrame, err->frames, err->frameCount);
|
||||||
cosmoM_free(state, CObjError, obj);
|
cosmoM_free(state, CObjError, obj);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case COBJ_CLOSURE: {
|
case COBJ_CLOSURE: {
|
||||||
CObjClosure *closure = (CObjClosure *)obj;
|
CObjClosure *closure = (CObjClosure *)obj;
|
||||||
cosmoM_freearray(state, CObjUpval *, closure->upvalues, closure->upvalueCount);
|
cosmoM_freeArray(state, CObjUpval *, closure->upvalues, closure->upvalueCount);
|
||||||
cosmoM_free(state, CObjClosure, closure);
|
cosmoM_free(state, CObjClosure, closure);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -305,7 +305,7 @@ CObjString *cosmoO_takeString(CState *state, char *str, size_t length)
|
|||||||
|
|
||||||
// have we already interned this string?
|
// have we already interned this string?
|
||||||
if (lookup != NULL) {
|
if (lookup != NULL) {
|
||||||
cosmoM_freearray(state, char, str,
|
cosmoM_freeArray(state, char, str,
|
||||||
length + 1); // free our passed character array, it's unneeded!
|
length + 1); // free our passed character array, it's unneeded!
|
||||||
return lookup;
|
return lookup;
|
||||||
}
|
}
|
||||||
|
@ -65,8 +65,9 @@ typedef struct
|
|||||||
CObjString *module; // name of the module
|
CObjString *module; // name of the module
|
||||||
CToken current;
|
CToken current;
|
||||||
CToken previous; // token right after the current token
|
CToken previous; // token right after the current token
|
||||||
int workingStackCount; // we push CValues of objects we need onto the stack so the garbage collector can see them.
|
int workingStackCount; // we push CValues of objects we need onto the stack so the garbage
|
||||||
// this is the count of those values so we'll know how many to pop off when we're done
|
// collector can see them. this is the count of those values so we'll
|
||||||
|
// know how many to pop off when we're done
|
||||||
} CParseState;
|
} CParseState;
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
@ -1370,7 +1371,7 @@ static void endLoop(CParseState *pstate)
|
|||||||
patchJmp(pstate, pstate->compiler->loop.breaks[--pstate->compiler->loop.breakCount]);
|
patchJmp(pstate, pstate->compiler->loop.breaks[--pstate->compiler->loop.breakCount]);
|
||||||
}
|
}
|
||||||
|
|
||||||
cosmoM_freearray(pstate->state, int, pstate->compiler->loop.breaks,
|
cosmoM_freeArray(pstate->state, int, pstate->compiler->loop.breaks,
|
||||||
pstate->compiler->loop.breakCapacity);
|
pstate->compiler->loop.breakCapacity);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1659,7 +1660,7 @@ static void breakStatement(CParseState *pstate)
|
|||||||
pstate->compiler->localCount = savedLocals;
|
pstate->compiler->localCount = savedLocals;
|
||||||
|
|
||||||
// add break to loop
|
// add break to loop
|
||||||
cosmoM_growarray(pstate->state, int, pstate->compiler->loop.breaks,
|
cosmoM_growArray(pstate->state, int, pstate->compiler->loop.breaks,
|
||||||
pstate->compiler->loop.breakCount, pstate->compiler->loop.breakCapacity);
|
pstate->compiler->loop.breakCount, pstate->compiler->loop.breakCapacity);
|
||||||
pstate->compiler->loop.breaks[pstate->compiler->loop.breakCount++] = writeJmp(pstate, OP_JMP);
|
pstate->compiler->loop.breaks[pstate->compiler->loop.breakCount++] = writeJmp(pstate, OP_JMP);
|
||||||
}
|
}
|
||||||
|
@ -120,7 +120,7 @@ void cosmoV_freeState(CState *state)
|
|||||||
cosmoT_clearTable(state, &state->strings);
|
cosmoT_clearTable(state, &state->strings);
|
||||||
|
|
||||||
// free our gray stack & finally free the state structure
|
// free our gray stack & finally free the state structure
|
||||||
cosmoM_freearray(state, CObj *, state->grayStack.array, state->grayStack.capacity);
|
cosmoM_freeArray(state, CObj *, state->grayStack.array, state->grayStack.capacity);
|
||||||
|
|
||||||
#ifdef GC_DEBUG
|
#ifdef GC_DEBUG
|
||||||
if (state->allocatedBytes != 0) {
|
if (state->allocatedBytes != 0) {
|
||||||
|
@ -61,7 +61,7 @@ void cosmoT_addTable(CState *state, CTable *from, CTable *to)
|
|||||||
|
|
||||||
void cosmoT_clearTable(CState *state, CTable *tbl)
|
void cosmoT_clearTable(CState *state, CTable *tbl)
|
||||||
{
|
{
|
||||||
cosmoM_freearray(state, CTableEntry, tbl->table, cosmoT_getCapacity(tbl));
|
cosmoM_freeArray(state, CTableEntry, tbl->table, cosmoT_getCapacity(tbl));
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t getObjectHash(CObj *obj)
|
static uint32_t getObjectHash(CObj *obj)
|
||||||
@ -165,7 +165,7 @@ static void resizeTbl(CState *state, CTable *tbl, int newCapacity, bool canShrin
|
|||||||
}
|
}
|
||||||
|
|
||||||
// free the old table
|
// free the old table
|
||||||
cosmoM_freearray(state, CTableEntry, tbl->table, oldCap);
|
cosmoM_freeArray(state, CTableEntry, tbl->table, oldCap);
|
||||||
|
|
||||||
tbl->table = entries;
|
tbl->table = entries;
|
||||||
tbl->capacityMask = newCapacity - 1;
|
tbl->capacityMask = newCapacity - 1;
|
||||||
|
@ -13,12 +13,12 @@ void initValArray(CState *state, CValueArray *val, size_t startCapacity)
|
|||||||
|
|
||||||
void cleanValArray(CState *state, CValueArray *array)
|
void cleanValArray(CState *state, CValueArray *array)
|
||||||
{
|
{
|
||||||
cosmoM_freearray(state, CValue, array->values, array->capacity);
|
cosmoM_freeArray(state, CValue, array->values, array->capacity);
|
||||||
}
|
}
|
||||||
|
|
||||||
void appendValArray(CState *state, CValueArray *array, CValue val)
|
void appendValArray(CState *state, CValueArray *array, CValue val)
|
||||||
{
|
{
|
||||||
cosmoM_growarray(state, CValue, array->values, array->count, array->capacity);
|
cosmoM_growArray(state, CValue, array->values, array->count, array->capacity);
|
||||||
|
|
||||||
array->values[array->count++] = val;
|
array->values[array->count++] = val;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user