Skip to content

Commit

Permalink
gc.c : free_unused_heap instead of free_unused_heaps
Browse files Browse the repository at this point in the history 
While free_unused_heaps doesn't seems as bottleneck, but I still against
running dump cicle every garbage collection.
  • Loading branch information
@funny-falcon
funny-falcon committed Feb 11, 2013
1 parent 20544f5 commit 6dd93ca
Showing 1 changed file with 30 additions and 36 deletions.
66 changes: 30 additions & 36 deletions gc.c
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -382,7 +382,6 @@ typedef struct rb_objspace {
size_t used; size_t used;
struct heaps_slot *reserve_slots; struct heaps_slot *reserve_slots;
RVALUE *range[2]; RVALUE *range[2];
struct heaps_header *freed;
size_t live_num; size_t live_num;
size_t free_num; size_t free_num;
size_t free_min; size_t free_min;
Expand Down Expand Up @@ -428,7 +427,6 @@ int *ruby_initial_gc_stress_ptr = &rb_objspace.gc_stress;
#define lomem objspace->heap.range[0] #define lomem objspace->heap.range[0]
#define himem objspace->heap.range[1] #define himem objspace->heap.range[1]
#define heaps_inc objspace->heap.increment #define heaps_inc objspace->heap.increment
#define heaps_freed objspace->heap.freed
#define dont_gc objspace->flags.dont_gc #define dont_gc objspace->flags.dont_gc
#define during_gc objspace->flags.during_gc #define during_gc objspace->flags.during_gc
#define finalizing objspace->flags.finalizing #define finalizing objspace->flags.finalizing
Expand Down Expand Up @@ -2186,6 +2184,8 @@ add_slot_local_freelist(rb_objspace_t *objspace, RVALUE *p)
return slot; return slot;
} }


static void free_unused_heap(rb_objspace_t *objspace, struct heaps_header *heap);

static void static void
finalize_list(rb_objspace_t *objspace, RVALUE *p) finalize_list(rb_objspace_t *objspace, RVALUE *p)
{ {
Expand All @@ -2199,7 +2199,10 @@ finalize_list(rb_objspace_t *objspace, RVALUE *p)
} }
} }
else { else {
GET_HEAP_HEADER(p)->limit--; struct heaps_header *heap = GET_HEAP_HEADER(p);
if (--heap->limit == 0) {
free_unused_heap(objspace, heap);
}
} }
p = tmp; p = tmp;
} }
Expand All @@ -2221,39 +2224,30 @@ unlink_heap_slot(rb_objspace_t *objspace, struct heaps_slot *slot)
} }


static void static void
free_unused_heaps(rb_objspace_t *objspace) free_unused_heap(rb_objspace_t *objspace, struct heaps_header *heap)
{ {
size_t i, j; register size_t hi, lo, mid;
struct heaps_header *last = 0; lo = 0;

hi = heaps_used;
for (i = j = 1; j < heaps_used; i++) { while (lo < hi) {
if (objspace->heap.sorted[i]->limit == 0) { mid = (lo + hi) / 2;
struct heaps_slot* h = objspace->heap.sorted[i]->base; if (heap > objspace->heap.sorted[mid]) {
lo = mid + 1;
}
else if (heap < objspace->heap.sorted[mid]) {
hi = mid;
}
else {
/* remove unused heap */
struct heaps_slot* h = objspace->heap.sorted[mid]->base;
h->free_next = objspace->heap.reserve_slots; h->free_next = objspace->heap.reserve_slots;
objspace->heap.reserve_slots = h; objspace->heap.reserve_slots = h;
if (!last) { aligned_free(objspace->heap.sorted[mid]);
last = objspace->heap.sorted[i]; heaps_used--;
} MEMMOVE(objspace->heap.sorted + mid, objspace->heap.sorted + mid + 1,
else { struct heaps_header *, heaps_used - mid);
aligned_free(objspace->heap.sorted[i]); return;
} }
heaps_used--;
}
else {
if (i != j) {
objspace->heap.sorted[j] = objspace->heap.sorted[i];
}
j++;
}
}
if (last) {
if (last < heaps_freed) {
aligned_free(heaps_freed);
heaps_freed = last;
}
else {
aligned_free(last);
}
} }
} }


Expand Down Expand Up @@ -2313,6 +2307,9 @@ slot_sweep(rb_objspace_t *objspace, struct heaps_slot *sweep_slot)
} }
sweep_slot->membase->limit = final_num; sweep_slot->membase->limit = final_num;
unlink_heap_slot(objspace, sweep_slot); unlink_heap_slot(objspace, sweep_slot);
if (final_num == 0) {
free_unused_heap(objspace, sweep_slot->membase);
}
} }
else { else {
if (free_num > 0) { if (free_num > 0) {
Expand Down Expand Up @@ -2382,8 +2379,6 @@ after_gc_sweep(rb_objspace_t *objspace)
if (malloc_limit < initial_malloc_limit) malloc_limit = initial_malloc_limit; if (malloc_limit < initial_malloc_limit) malloc_limit = initial_malloc_limit;
} }
malloc_increase = 0; malloc_increase = 0;

free_unused_heaps(objspace);
} }


static int static int
Expand Down Expand Up @@ -3333,7 +3328,6 @@ rb_gc(void)
rb_objspace_t *objspace = &rb_objspace; rb_objspace_t *objspace = &rb_objspace;
garbage_collect(objspace); garbage_collect(objspace);
if (!finalizing) finalize_deferred(objspace); if (!finalizing) finalize_deferred(objspace);
free_unused_heaps(objspace);
} }


static inline int static inline int
Expand Down

0 comments on commit 6dd93ca

Please sign in to comment.