diff options
| author | hboehm <hboehm> | 2007-10-25 00:41:06 +0000 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2011-07-26 21:06:41 +0400 |
| commit | ef17eb1a029a21ba27d397a282a43fcadfea5c0f (patch) | |
| tree | 7ec6e38ec8592ff5604434a9e3a3e2b4845272d5 /thread_local_alloc.c | |
| parent | 6bd946e18d7ec227ee1c295b3d0122758c07511e (diff) | |
| download | bdwgc-ef17eb1a029a21ba27d397a282a43fcadfea5c0f.tar.gz | |
2007-10-24 Hans Boehm <Hans.Boehm@hp.com>
* reclaim.c (GC_bytes_found): Expand comment.
* thread_local_alloc.c (GC_malloc_atomic, GC_gcj_malloc): Pass
granules, not bytes, to GC_FAST_MALLOC_GRANS.
* include/gc.h: Never include gc_local_alloc.h.
* tests/test.c: Add size zero allocation tests.
Diffstat (limited to 'thread_local_alloc.c')
| -rw-r--r-- | thread_local_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/thread_local_alloc.c b/thread_local_alloc.c index fa1499e2..59881750 100644 --- a/thread_local_alloc.c +++ b/thread_local_alloc.c @@ -206,7 +206,7 @@ void * GC_malloc_atomic(size_t bytes) # endif GC_ASSERT(GC_is_initialized); tiny_fl = ((GC_tlfs)tsd) -> ptrfree_freelists; - GC_FAST_MALLOC_GRANS(result, bytes, tiny_fl, DIRECT_GRANULES, + GC_FAST_MALLOC_GRANS(result, granules, tiny_fl, DIRECT_GRANULES, PTRFREE, GC_core_malloc_atomic(bytes), 0/* no init */); return result; } @@ -252,7 +252,7 @@ void * GC_gcj_malloc(size_t bytes, void **tiny_fl = ((GC_tlfs)GC_getspecific(GC_thread_key)) -> gcj_freelists; GC_ASSERT(GC_gcj_malloc_initialized); - GC_FAST_MALLOC_GRANS(result, bytes, tiny_fl, DIRECT_GRANULES, + GC_FAST_MALLOC_GRANS(result, granules, tiny_fl, DIRECT_GRANULES, GC_gcj_kind, GC_core_gcj_malloc(bytes, ptr_to_struct_containing_descr), |