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
wants to merge 4 commits into from
Closed

Gc small fixes/trunk #88

Changes from all commits
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
97 changes: 33 additions & 64 deletions gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,11 +313,11 @@ struct heaps_slot {
void *membase;
RVALUE *slot;
size_t limit;
uintptr_t *bits;
RVALUE *freelist;
struct heaps_slot *next;
struct heaps_slot *prev;
struct heaps_slot *free_next;
uintptr_t bits[1];
};

struct heaps_header {
Expand All @@ -331,10 +331,6 @@ struct sorted_heaps_slot {
struct heaps_slot *slot;
};

struct heaps_free_bitmap {
struct heaps_free_bitmap *next;
};

struct gc_list {
VALUE *varptr;
struct gc_list *next;
Expand All @@ -361,9 +357,8 @@ typedef struct rb_objspace {
struct sorted_heaps_slot *sorted;
size_t length;
size_t used;
struct heaps_free_bitmap *free_bitmap;
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 @@ -413,7 +408,6 @@ int *ruby_initial_gc_stress_ptr = &rb_objspace.gc_stress;
#define lomem objspace->heap.range[0]
#define himem objspace->heap.range[1]
#define heaps_inc objspace->heap.increment
#define heaps_freed objspace->heap.freed
#define dont_gc objspace->flags.dont_gc
#define during_gc objspace->flags.during_gc
#define finalizing objspace->flags.finalizing
Expand Down Expand Up @@ -514,17 +508,16 @@ rb_objspace_free(rb_objspace_t *objspace)
xfree(list);
}
}
if (objspace->heap.free_bitmap) {
struct heaps_free_bitmap *list, *next;
for (list = objspace->heap.free_bitmap; list; list = next) {
next = list->next;
free(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) {
free(objspace->heap.sorted[i].slot->bits);
aligned_free(objspace->heap.sorted[i].slot->membase);
free(objspace->heap.sorted[i].slot);
}
Expand All @@ -538,13 +531,14 @@ rb_objspace_free(rb_objspace_t *objspace)

/* tiny heap size: 16KB */
#define HEAP_ALIGN_LOG 14
#define HEAP_ALIGN 0x4000
#define HEAP_ALIGN_MASK 0x3fff
#define HEAP_ALIGN (1 << HEAP_ALIGN_LOG)
#define HEAP_ALIGN_MASK (HEAP_ALIGN - 1)
#define REQUIRED_SIZE_BY_MALLOC (sizeof(size_t) * 5)
#define HEAP_SIZE (HEAP_ALIGN - REQUIRED_SIZE_BY_MALLOC)

#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 @@ -1052,7 +1046,6 @@ static void
allocate_sorted_heaps(rb_objspace_t *objspace, size_t next_heaps_length)
{
struct sorted_heaps_slot *p;
struct heaps_free_bitmap *bits;
size_t size, add, i;

size = next_heaps_length*sizeof(struct sorted_heaps_slot);
Expand All @@ -1070,17 +1063,6 @@ allocate_sorted_heaps(rb_objspace_t *objspace, size_t next_heaps_length)
during_gc = 0;
rb_memerror();
}

for (i = 0; i < add; i++) {
bits = (struct heaps_free_bitmap *)malloc(HEAP_BITMAP_LIMIT * sizeof(uintptr_t));
if (bits == 0) {
during_gc = 0;
rb_memerror();
return;
}
bits->next = objspace->heap.free_bitmap;
objspace->heap.free_bitmap = bits;
}
}

static void *
Expand Down Expand Up @@ -1146,13 +1128,20 @@ assign_heap_slot(rb_objspace_t *objspace)
during_gc = 0;
rb_memerror();
}
slot = (struct heaps_slot *)malloc(sizeof(struct heaps_slot));
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 @@ -1192,12 +1181,8 @@ assign_heap_slot(rb_objspace_t *objspace)
heaps->membase = membase;
heaps->slot = p;
heaps->limit = objs;
assert(objspace->heap.free_bitmap != NULL);
heaps->bits = (uintptr_t *)objspace->heap.free_bitmap;
objspace->heap.free_bitmap = objspace->heap.free_bitmap->next;
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 @@ -2142,39 +2127,23 @@ static void
free_unused_heaps(rb_objspace_t *objspace)
{
size_t i, j;
RVALUE *last = 0;

for (i = j = 1; j < heaps_used; i++) {
if (objspace->heap.sorted[i].slot->limit == 0) {
struct heaps_slot* h = objspace->heap.sorted[i].slot;
((struct heaps_free_bitmap *)(h->bits))->next =
objspace->heap.free_bitmap;
objspace->heap.free_bitmap = (struct heaps_free_bitmap *)h->bits;
if (!last) {
last = objspace->heap.sorted[i].slot->membase;
}
else {
aligned_free(objspace->heap.sorted[i].slot->membase);
}
free(objspace->heap.sorted[i].slot);
register struct sorted_heaps_slot *ptr = objspace->heap.sorted + 1;

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);
heaps_used--;
}
else {
if (i != j) {
objspace->heap.sorted[j] = objspace->heap.sorted[i];
objspace->heap.sorted[j] = *ptr;
}
j++;
}
}
if (last) {
if (last < heaps_freed) {
aligned_free(heaps_freed);
heaps_freed = last;
}
else {
aligned_free(last);
}
}
}

static void
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy