diff options
| author | nari <nari@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-13 12:57:16 +0000 |
|---|---|---|
| committer | nari <nari@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-13 12:57:16 +0000 |
| commit | 261400e7a9b4e8774a058e9a6f53fc885329c5f8 (patch) | |
| tree | 98afd7ff8dc636bd4a8ad1573f6a0c7b6c1cda39 /gc.c | |
| parent | df77202b372535d58fccc244113fd9944c7b01c0 (diff) | |
* gc.c (HEAP_OBJ_LIMIT, HEAP_BITMAP_LIMIT): HEAP_OBJ_LIMIT used
`sizeof(struct heaps_slot)` while heap is currently allocated
with `struct heaps_header`.
HEAP_BITMAP_LIMIT were calculated from
`HEAP_OBJ_LIMIT/sizeof(uintptr_t)` - one Byte for each object,
not one Bit. [Bug #6006]
patched by Sokolov Yura. https://github.com/ruby/ruby/pull/92
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
| -rw-r--r-- | gc.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -544,9 +544,10 @@ rb_objspace_free(rb_objspace_t *objspace) #define HEAP_ALIGN_MASK (~(~0UL << HEAP_ALIGN_LOG)) #define REQUIRED_SIZE_BY_MALLOC (sizeof(size_t) * 5) #define HEAP_SIZE (HEAP_ALIGN - REQUIRED_SIZE_BY_MALLOC) +#define CEILMOD(i, mod) (((i) + (mod) - 1)/(mod)) -#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 HEAP_OBJ_LIMIT (unsigned int)((HEAP_SIZE - sizeof(struct heaps_header))/sizeof(struct RVALUE)) +#define HEAP_BITMAP_LIMIT CEILMOD(HEAP_OBJ_LIMIT, sizeof(uintptr_t)*8) #define GET_HEAP_HEADER(x) (HEAP_HEADER(((uintptr_t)x) & ~(HEAP_ALIGN_MASK))) #define GET_HEAP_SLOT(x) (GET_HEAP_HEADER(x)->base) |