Skip to content

Gc small fixes/trunk #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
funny-falcon wants to merge 4 commits into from
Closed

Gc small fixes/trunk #88

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f8f399
gc: embed bits into heaps_slot
funny-falcon Jan 27, 2012
5cae0f8
gc: heaps_freed seems to be not unused with new GC
funny-falcon Jan 27, 2012
38bb356
gc: automatick HEAP_ALIGN and HEAP_ALIGN_MASK calculation
funny-falcon Jan 27, 2012
2a09c16
gc: linked list of heaps_slot
funny-falcon Jan 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
gc: linked list of heaps_slot
  • Loading branch information
@funny-falcon
funny-falcon committed Jan 27, 2012
commit 2a09c16cbdb9580164b9d9ff90a257e6694f2a7f
33 changes: 24 additions & 9 deletions gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ typedef struct rb_objspace {
size_t length;
size_t used;
RVALUE *range[2];
RVALUE *freed;
struct heaps_slot *reserve_slots;
size_t live_num;
size_t free_num;
size_t free_min;
Expand Down Expand Up @@ -508,6 +508,13 @@ rb_objspace_free(rb_objspace_t *objspace)
xfree(list);
}
}
if (objspace->heap.reserve_slots) {
struct heaps_slot *list, *next;
for (list = objspace->heap.reserve_slots; list; list = next) {
next = list->free_next;
free(list);
}
}
if (objspace->heap.sorted) {
size_t i;
for (i = 0; i < heaps_used; ++i) {
Expand All @@ -531,6 +538,7 @@ rb_objspace_free(rb_objspace_t *objspace)

#define HEAP_OBJ_LIMIT (unsigned int)(HEAP_SIZE/sizeof(struct RVALUE) - (sizeof(struct heaps_slot)/sizeof(struct RVALUE)+1))
#define HEAP_BITMAP_LIMIT (HEAP_OBJ_LIMIT/sizeof(uintptr_t)+1)
#define SIZEOF_HEAPS_SLOT (sizeof(struct heaps_slot) + HEAP_BITMAP_LIMIT * sizeof(uintptr_t))

#define GET_HEAP_HEADER(x) (HEAP_HEADER(((uintptr_t)x) & ~(HEAP_ALIGN_MASK)))
#define GET_HEAP_SLOT(x) (GET_HEAP_HEADER(x)->base)
Expand Down Expand Up @@ -1120,13 +1128,20 @@ assign_heap_slot(rb_objspace_t *objspace)
during_gc = 0;
rb_memerror();
}
slot = (struct heaps_slot *)malloc(sizeof(struct heaps_slot) + HEAP_BITMAP_LIMIT * sizeof(uintptr_t));
if (slot == 0) {
aligned_free(p);
during_gc = 0;
rb_memerror();

if (objspace->heap.reserve_slots != NULL) {
slot = objspace->heap.reserve_slots;
objspace->heap.reserve_slots = slot->free_next;
}
else {
slot = (struct heaps_slot *)malloc(SIZEOF_HEAPS_SLOT);
if (slot == 0) {
aligned_free(p);
during_gc = 0;
rb_memerror();
}
}
MEMZERO((void*)slot, struct heaps_slot, 1);
memset((void*)slot, 0, SIZEOF_HEAPS_SLOT);

slot->next = heaps;
if (heaps) heaps->prev = slot;
Expand Down Expand Up @@ -1168,7 +1183,6 @@ assign_heap_slot(rb_objspace_t *objspace)
heaps->limit = objs;
HEAP_HEADER(membase)->base = heaps;
HEAP_HEADER(membase)->bits = heaps->bits;
memset(heaps->bits, 0, HEAP_BITMAP_LIMIT * sizeof(uintptr_t));
objspace->heap.free_num += objs;
pend = p + objs;
if (lomem == 0 || lomem > p) lomem = p;
Expand Down Expand Up @@ -2118,8 +2132,9 @@ free_unused_heaps(rb_objspace_t *objspace)
for (i = j = 1; j < heaps_used; i++, ptr++) {
if (ptr->slot->limit == 0) {
struct heaps_slot* h = ptr->slot;
h->free_next = objspace->heap.reserve_slots;
objspace->heap.reserve_slots = h;
aligned_free(h->membase);
free(h);
heaps_used--;
}
else {
Expand Down