From bd88bf87daa832d83d8f9a19038fc9c873283783 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Wed, 25 Jan 2006 18:20:28 +0000 Subject: [PATCH] fixed buglets reported by Jens Granseuer in #328254. Wed Jan 25 19:16:57 2006 Tim Janik * fixed buglets reported by Jens Granseuer in #328254. * configure.in: free the memory allocated in posix_memalign() tests. * glib/gslice.c: spelling fixes. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-12 | 8 ++++++++ configure.in | 2 ++ glib/gslice.c | 18 +++++++++--------- 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 631a52f7..d583e974 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Jan 25 19:16:57 2006 Tim Janik + + * fixed buglets reported by Jens Granseuer in #328254. + + * configure.in: free the memory allocated in posix_memalign() tests. + + * glib/gslice.c: spelling fixes. + Wed Jan 25 16:39:18 2006 Tim Janik * glib/gslice.c: honour g_mem_gc_friendly settings when freeing diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 631a52f7..d583e974 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Wed Jan 25 19:16:57 2006 Tim Janik + + * fixed buglets reported by Jens Granseuer in #328254. + + * configure.in: free the memory allocated in posix_memalign() tests. + + * glib/gslice.c: spelling fixes. + Wed Jan 25 16:39:18 2006 Tim Janik * glib/gslice.c: honour g_mem_gc_friendly settings when freeing diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 631a52f7..d583e974 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +Wed Jan 25 19:16:57 2006 Tim Janik + + * fixed buglets reported by Jens Granseuer in #328254. + + * configure.in: free the memory allocated in posix_memalign() tests. + + * glib/gslice.c: spelling fixes. + Wed Jan 25 16:39:18 2006 Tim Janik * glib/gslice.c: honour g_mem_gc_friendly settings when freeing diff --git a/configure.in b/configure.in index 20623b8a..2b1d1813 100644 --- a/configure.in +++ b/configure.in @@ -1034,6 +1034,8 @@ AC_CACHE_VAL(glib_cv_compliant_posix_memalign,[ void *mem = 0; if (posix_memalign (&mem, boundary, size) != 0 || !mem) exit (1); + else + free (mem); } int main() { test_memalign ( 128, 128 - 2 * sizeof (void*)); diff --git a/glib/gslice.c b/glib/gslice.c index 9fa6f621..4d377f20 100644 --- a/glib/gslice.c +++ b/glib/gslice.c @@ -39,7 +39,7 @@ #endif #if defined HAVE_POSIX_MEMALIGN && defined POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS -# define HAVE_COMLIANT_POSIX_MEMALIGN 1 +# define HAVE_COMPLIANT_POSIX_MEMALIGN 1 #endif @@ -297,7 +297,7 @@ g_slice_init_nomessage (void) mem_assert ((sys_page_size & (sys_page_size - 1)) == 0); slice_config_init (&allocator->config); allocator->min_page_size = sys_page_size; -#if HAVE_COMLIANT_POSIX_MEMALIGN || HAVE_MEMALIGN +#if HAVE_COMPLIANT_POSIX_MEMALIGN || HAVE_MEMALIGN /* allow allocation of pages up to 8KB (with 8KB alignment). * this is useful because many medium to large sized structures * fit less than 8 times (see [4]) into 4KB pages. @@ -1044,14 +1044,14 @@ slab_allocator_free_chunk (gsize chunk_size, #endif /* from config.h: - * define HAVE_POSIX_MEMALIGN 1 // if free(posix_memalign(3)) works, - * define HAVE_COMLIANT_POSIX_MEMALIGN 1 // if free(posix_memalign(3)) works for sizes != 2^n, - * define HAVE_MEMALIGN 1 // if free(memalign(3)) works, - * define HAVE_VALLOC 1 // if free(valloc(3)) works, or + * define HAVE_POSIX_MEMALIGN 1 // if free(posix_memalign(3)) works, + * define HAVE_COMPLIANT_POSIX_MEMALIGN 1 // if free(posix_memalign(3)) works for sizes != 2^n, + * define HAVE_MEMALIGN 1 // if free(memalign(3)) works, + * define HAVE_VALLOC 1 // if free(valloc(3)) works, or * if none is provided, we implement malloc(3)-based alloc-only page alignment */ -#if !(HAVE_COMLIANT_POSIX_MEMALIGN || HAVE_MEMALIGN || HAVE_VALLOC) +#if !(HAVE_COMPLIANT_POSIX_MEMALIGN || HAVE_MEMALIGN || HAVE_VALLOC) static GTrashStack *compat_valloc_trash = NULL; #endif @@ -1061,7 +1061,7 @@ allocator_memalign (gsize alignment, { gpointer aligned_memory = NULL; gint err = ENOMEM; -#if HAVE_COMLIANT_POSIX_MEMALIGN +#if HAVE_COMPLIANT_POSIX_MEMALIGN err = posix_memalign (&aligned_memory, alignment, memsize); #elif HAVE_MEMALIGN errno = 0; @@ -1101,7 +1101,7 @@ static void allocator_memfree (gsize memsize, gpointer mem) { -#if HAVE_COMLIANT_POSIX_MEMALIGN || HAVE_MEMALIGN || HAVE_VALLOC +#if HAVE_COMPLIANT_POSIX_MEMALIGN || HAVE_MEMALIGN || HAVE_VALLOC free (mem); #else mem_assert (memsize <= sys_page_size); -- 2.34.1