Changeset: 7b8dd50c088e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7b8dd50c088e
Modified Files:
gdk/gdk_utils.c
Branch: Dec2025
Log Message:
Cleanup: use inline functions instead of macros.
diffs (100 lines):
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -448,7 +448,7 @@ size_t GDK_mmap_pagesize = MMAP_PAGESIZE
size_t GDK_mem_maxsize = GDK_VM_MAXSIZE;
size_t GDK_vm_maxsize = GDK_VM_MAXSIZE;
-#define SEG_SIZE(x) ((ssize_t) (((x) + _MT_pagesize - 1) & ~(_MT_pagesize -
1)))
+#define SEG_SIZE(x) (((x) + _MT_pagesize - 1) & ~(_MT_pagesize - 1))
/* This block is to provide atomic addition and subtraction to select
* variables. We use intrinsic functions (recognized and inlined by
@@ -1699,32 +1699,34 @@ GDKvm_cursize(void)
return (size_t) ATOMIC_GET(&GDK_vm_cursize) + GDKmem_cursize();
}
-#define heapinc(_memdelta) \
- ATOMIC_ADD(&GDK_mallocedbytes_estimate, _memdelta)
-#ifndef NDEBUG
-#define heapdec(_memdelta)
\
- do { \
- ATOMIC_BASE_TYPE old = ATOMIC_SUB(&GDK_mallocedbytes_estimate,
_memdelta); \
- assert(old >= (ATOMIC_BASE_TYPE) _memdelta); \
- } while (0)
-#else
-#define heapdec(_memdelta) \
- ATOMIC_SUB(&GDK_mallocedbytes_estimate, _memdelta)
-#endif
+static inline void
+heapinc(size_t memdelta)
+{
+ ATOMIC_ADD(&GDK_mallocedbytes_estimate, memdelta);
+}
+
+static inline void
+heapdec(size_t memdelta)
+{
+ size_t old = (size_t) ATOMIC_SUB(&GDK_mallocedbytes_estimate, memdelta);
+ (void) old;
+ assert(old >= memdelta);
+}
-#define meminc(vmdelta)
\
- ATOMIC_ADD(&GDK_vm_cursize, SEG_SIZE(vmdelta))
-#ifndef NDEBUG
-#define memdec(vmdelta)
\
- do { \
- ssize_t diff = SEG_SIZE(vmdelta); \
- ATOMIC_BASE_TYPE old = ATOMIC_SUB(&GDK_vm_cursize, diff); \
- assert(old >= (ATOMIC_BASE_TYPE) diff); \
- } while (0)
-#else
-#define memdec(vmdelta)
\
- ATOMIC_SUB(&GDK_vm_cursize, SEG_SIZE(vmdelta))
-#endif
+static inline void
+meminc(size_t vmdelta)
+{
+ ATOMIC_ADD(&GDK_vm_cursize, SEG_SIZE(vmdelta));
+}
+
+static inline void
+memdec(size_t vmdelta)
+{
+ size_t diff = SEG_SIZE(vmdelta);
+ size_t old = (size_t) ATOMIC_SUB(&GDK_vm_cursize, diff);
+ (void) old;
+ assert(old >= diff);
+}
/* Memory allocation
*
@@ -1744,9 +1746,6 @@ GDKvm_cursize(void)
* is also where the extra space at the end comes in.
*/
-/* malloc smaller than this aren't subject to the GDK_vm_maxsize test */
-#define SMALL_MALLOC 256
-
static void *
GDKmalloc_internal(size_t size, bool clear)
{
@@ -1867,7 +1866,7 @@ GDKfree(void *s)
#endif
free((char *) s - MALLOC_EXTRA_SPACE);
- heapdec((ssize_t) asize);
+ heapdec(asize);
}
#undef GDKrealloc
@@ -1926,7 +1925,7 @@ GDKrealloc(void *s, size_t size)
#endif
heapinc(nsize + MALLOC_EXTRA_SPACE + DEBUG_SPACE);
- heapdec((ssize_t) asize);
+ heapdec(asize);
return s;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
