From a83ccbd2515b3e99f12d7b165ce6b295c057bc07 Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Sun, 27 Mar 2022 14:11:42 +0200 Subject: [PATCH 1/2] Convert tests/slice-threadinit.c to glib test framework --- tests/slice-threadinit.c | 52 ++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/tests/slice-threadinit.c b/tests/slice-threadinit.c index e303aa0b2..3b1539e3d 100644 --- a/tests/slice-threadinit.c +++ b/tests/slice-threadinit.c @@ -18,15 +18,22 @@ * otherwise) arising in any way out of the use of this software, even * if advised of the possibility of such damage. */ + +/* We are testing threadinit which is deprecated */ +#ifndef GLIB_DISABLE_DEPRECATION_WARNINGS +#define GLIB_DISABLE_DEPRECATION_WARNINGS +#endif + #include -#define N_PAGES (101) /* number of pages to sample */ -#define SAMPLE_SIZE (7) -#define PAGE_SIZE (128) /* must be <= minimum GSlice alignment block */ -#define MAGAZINE_PROBES { 97, 265, 347 } /* block sizes hopefully unused by g_thread_init */ -#define MAX_PROBE_TRIALS (1031) /* must be >= maximum magazine size */ +#define N_PAGES (101) /* number of pages to sample */ +#define SAMPLE_SIZE (7) +#define PAGE_SIZE (128) /* must be <= minimum GSlice alignment block */ +#define MAGAZINE_PROBES { 97, 265, 347 } /* block sizes hopefully unused by g_thread_init */ +#define MAX_PROBE_TRIALS (1031) /* must be >= maximum magazine size */ -#define ALIGN(size, base) ((base) * (gsize) (((size) + (base) - 1) / (base))) +#define ALIGN(size, base) \ + ((base) * (gsize) (((size) + (base) - 1) / (base))) static struct { void *page; @@ -34,6 +41,7 @@ static struct { } pages[N_PAGES] = { { NULL, NULL }, }; static const guint magazine_probes[] = MAGAZINE_PROBES; + #define N_MAGAZINE_PROBES G_N_ELEMENTS (magazine_probes) static void @@ -66,9 +74,8 @@ allocate_from_known_page (void) return FALSE; } -int -main (int argc, - char *argv[]) +static void +test_slice_thread_init (void) { gsize j, n_pages = 0; void *mps[N_MAGAZINE_PROBES]; @@ -99,15 +106,15 @@ main (int argc, release_trash_list (&free_list, SAMPLE_SIZE); /* ensure that we can allocate from known pages */ - if (!allocate_from_known_page()) - g_error ("failed to allocate from magazine/page cache (before g_thread_init)"); + g_assert_true (allocate_from_known_page()); + /* release intermediate allocations */ release_trash_list (&free_list, SAMPLE_SIZE); /* release magazine probes to be retained */ for (j = 0; j < N_MAGAZINE_PROBES; j++) g_slice_free1 (magazine_probes[j], mps[j]); - /* mps[*] now contains pointers to releaed slices */ + /* mps[*] now contains pointers to released slices */ /* ensure probes were retained */ for (j = 0; j < N_MAGAZINE_PROBES; j++) @@ -122,8 +129,7 @@ main (int argc, trash = g_slist_prepend (trash, mem); } release_trash_list (&trash, magazine_probes[j]); - if (k >= MAX_PROBE_TRIALS) /* failed to reallocate slice */ - g_error ("failed to reallocate slice from magazine (before g_thread_init): size=%d", magazine_probes[j]); + g_assert_cmpint (k, <, MAX_PROBE_TRIALS); /* failed to reallocate slice */ } /* mps[*] now contains pointers to reallocated slices */ @@ -148,19 +154,25 @@ main (int argc, trash = g_slist_prepend (trash, mem); } release_trash_list (&trash, magazine_probes[j]); - if (k >= MAX_PROBE_TRIALS) /* failed to reallocate slice */ - g_error ("failed to reallocate slice from magazine (after g_thread_init): size=%d", magazine_probes[j]); + g_assert_cmpint (k, <, MAX_PROBE_TRIALS); /* failed to reallocate slice */ } /* mps[*] now contains pointers to reallocated slices */ /* ensure that we can allocate from known pages */ - if (!allocate_from_known_page()) - g_error ("failed to allocate from magazine/page cache (after g_thread_init)"); + g_assert_true (allocate_from_known_page()); /* some cleanups */ for (j = 0; j < N_MAGAZINE_PROBES; j++) g_slice_free1 (magazine_probes[j], mps[j]); release_trash_list (&free_list, SAMPLE_SIZE); - - return 0; +} + +int +main (int argc, char *argv[]) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/slice/thread-init", test_slice_thread_init); + + return g_test_run (); } From ddb0585e65dc31c5d352990f90307c4fd0d754d0 Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Sun, 27 Mar 2022 17:34:35 +0200 Subject: [PATCH 2/2] Moving slice-threadinit.c test to glib/tests/ Related to issue #1434 --- glib/tests/meson.build | 1 + .../tests/slice-known-pages.c | 21 +++++++------------ tests/meson.build | 3 --- 3 files changed, 9 insertions(+), 16 deletions(-) rename tests/slice-threadinit.c => glib/tests/slice-known-pages.c (90%) diff --git a/glib/tests/meson.build b/glib/tests/meson.build index add0ce4f5..e562e63b5 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build @@ -105,6 +105,7 @@ glib_tests = { 'extra_sources' : ['memchunks.c'], }, 'slice-concurrent' : {}, + 'slice-known-pages' : {}, 'slist' : {}, 'sort' : {}, 'spawn-multithreaded' : {}, diff --git a/tests/slice-threadinit.c b/glib/tests/slice-known-pages.c similarity index 90% rename from tests/slice-threadinit.c rename to glib/tests/slice-known-pages.c index 3b1539e3d..ee856068b 100644 --- a/tests/slice-threadinit.c +++ b/glib/tests/slice-known-pages.c @@ -1,4 +1,4 @@ -/* slice-threadinit.c - test GSlice across g_thread_init +/* slice-known-pages.c - test GSlice across known pages * Copyright (C) 2007 Tim Janik * * This work is provided "as is"; redistribution and modification @@ -19,17 +19,15 @@ * if advised of the possibility of such damage. */ -/* We are testing threadinit which is deprecated */ -#ifndef GLIB_DISABLE_DEPRECATION_WARNINGS -#define GLIB_DISABLE_DEPRECATION_WARNINGS -#endif - #include #define N_PAGES (101) /* number of pages to sample */ #define SAMPLE_SIZE (7) #define PAGE_SIZE (128) /* must be <= minimum GSlice alignment block */ -#define MAGAZINE_PROBES { 97, 265, 347 } /* block sizes hopefully unused by g_thread_init */ +#define MAGAZINE_PROBES \ + { \ + 97, 265, 347 \ + } /* block sizes hopefully unused */ #define MAX_PROBE_TRIALS (1031) /* must be >= maximum magazine size */ #define ALIGN(size, base) \ @@ -75,7 +73,7 @@ allocate_from_known_page (void) } static void -test_slice_thread_init (void) +test_slice_known_pages (void) { gsize j, n_pages = 0; void *mps[N_MAGAZINE_PROBES]; @@ -133,14 +131,11 @@ test_slice_thread_init (void) } /* mps[*] now contains pointers to reallocated slices */ - /* release magazine probes to be retained across g_thread_init */ + /* release magazine probes to be retained across known pages */ for (j = 0; j < N_MAGAZINE_PROBES; j++) g_slice_free1 (magazine_probes[j], mps[j]); /* mps[*] now contains pointers to released slices */ - /* initialize threading (should retain allocator state) */ - g_thread_init (NULL); - /* ensure probes were retained */ for (j = 0; j < N_MAGAZINE_PROBES; j++) { @@ -172,7 +167,7 @@ main (int argc, char *argv[]) { g_test_init (&argc, &argv, NULL); - g_test_add_func ("/slice/thread-init", test_slice_thread_init); + g_test_add_func ("/slice/known_pages", test_slice_known_pages); return g_test_run (); } diff --git a/tests/meson.build b/tests/meson.build index acf43ea13..777ba428c 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -16,9 +16,6 @@ subdir('gobject') subdir('refcount') tests = { - 'slice-threadinit' : { - 'dependencies' : [libgthread_dep], - }, 'module-test-library' : { 'dependencies' : [libgmodule_dep], 'export_dynamic' : true,