Rename ROUNDED_UP_GRANULES macro to ALLOC_REQUEST_GRANS

(refactoring)

* include/gc/gc_tiny_fl.h (GC_RAW_BYTES_FROM_INDEX): Update comment
(rename ROUNDED_UP_GRANULES to ALLOC_REQUEST_GRANS).
* include/private/gc_priv.h (ADD_SLOP): Rename to ADD_EXTRA_BYTES; move
definition upper (to be before ALLOC_REQUEST_GRANS).
* include/private/gc_priv.h (ROUNDED_UP_GRANULES): Rename to
ALLOC_REQUEST_GRANS; refine comment.
* include/private/gc_priv.h (SMALL_OBJ): Remove extra parentheses; add
comment.
* include/private/gc_priv.h (_GC_arrays._size_map): Refine comment.
* malloc.c (GC_extend_size_map, GC_generic_malloc_aligned): Rename
ROUNDED_UP_GRANULES to ALLOC_REQUEST_GRANS.
* misc.c (GC_init_size_map): Likewise.
* thread_local_alloc.c [THREAD_LOCAL_ALLOC] (GC_malloc_kind): Likewise.
* thread_local_alloc.c [THREAD_LOCAL_ALLOC && GC_GCJ_SUPPORT]
(GC_gcj_malloc): Likewise.
* malloc.c (GC_generic_malloc_inner): Rename ADD_SLOP to
ADD_EXTRA_BYTES.
* mallocx.c (GC_realloc): Likewise.
* mallocx.c (GC_malloc_many): Define lg local variable; use
ALLOC_REQUEST_GRANS() and GRANULES_TO_BYTES(); remove comment.

1 files changed, 3 insertions, 6 deletions

diff --git a/mallocx.c b/mallocx.c
index 091ba14f..44071f0c 100644
--- a/mallocx.c
+++ b/mallocx.c
@@ -143,7 +143,7 @@ GC_API void * GC_CALL GC_realloc(void * p, size_t lb)
           if (IS_UNCOLLECTABLE(obj_kind)) GC_non_gc_bytes += (sz - orig_sz);
           /* Extra area is already cleared by GC_alloc_large_and_clear. */
     }
-    if (ADD_SLOP(lb) <= sz) {
+    if (ADD_EXTRA_BYTES(lb) <= sz) {
         if (lb >= (sz >> 1)) {
             if (orig_sz > lb) {
               /* Clear unneeded part of object to avoid bogus pointer */
@@ -440,12 +440,9 @@ GC_API void GC_CALL GC_generic_malloc_many(size_t lb, int k, void **result)
 GC_API GC_ATTR_MALLOC void * GC_CALL GC_malloc_many(size_t lb)
 {
     void *result;
+    size_t lg = ALLOC_REQUEST_GRANS(lb);
 
-    /* Add EXTRA_BYTES and round up to a multiple of a granule. */
-    lb = SIZET_SAT_ADD(lb, EXTRA_BYTES + GRANULE_BYTES - 1)
-            & ~(GRANULE_BYTES - 1);
-
-    GC_generic_malloc_many(lb, NORMAL, &result);
+    GC_generic_malloc_many(GRANULES_TO_BYTES(lg), NORMAL, &result);
     return result;
 }