From 495508cf840bf421803a9ba3c125ae6ff8d7ed8c Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Sat, 19 Mar 2022 15:59:30 +0100 Subject: [PATCH 1/4] Enabling disabled slice-color test case --- tests/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/meson.build b/tests/meson.build index fa7fddb84..091f77ac5 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -20,6 +20,9 @@ tests = { 'mainloop-test' : {}, 'mapping-test' : {}, 'onceinit' : {}, + 'slice-color' : { + 'extra_sources' : ['memchunks.c'], + }, 'slice-concurrent' : {}, 'slice-threadinit' : { 'dependencies' : [libgthread_dep], @@ -46,9 +49,6 @@ test_extra_programs = { 'slice-test' : { 'extra_sources' : ['memchunks.c'], }, - 'slice-color' : { - 'extra_sources' : ['memchunks.c'], - }, 'assert-msg-test' : {}, } From 6211971c418b188bf83512de8e0c4fc9528baff4 Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Sun, 20 Mar 2022 19:51:06 +0100 Subject: [PATCH 2/4] Convert tests/slice-color.c to glib test framework --- tests/slice-color.c | 130 +++++++++++++++----------------------------- 1 file changed, 43 insertions(+), 87 deletions(-) diff --git a/tests/slice-color.c b/tests/slice-color.c index bcbb9709e..733bfcc56 100644 --- a/tests/slice-color.c +++ b/tests/slice-color.c @@ -14,22 +14,21 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ + #include -#include -#define ALIGN(size, base) ((base) * (gsize) (((size) + (base) - 1) / (base))) - -static gdouble parse_memsize (const gchar *cstring); -static void usage (void); +#define ALIGN(size, base) \ + ((base) * (gsize) (((size) + (base) - 1) / (base))) static void fill_memory (guint **mem, guint n, guint val) { - guint j, o = 0; + guint j; + for (j = 0; j < n; j++) - mem[j][o] = val; + mem[j][0] = val; } static guint64 @@ -40,15 +39,17 @@ access_memory3 (guint **mema, guint64 repeats) { guint64 accu = 0, i, j; - const guint o = 0; + for (i = 0; i < repeats; i++) { for (j = 1; j < n; j += 2) - memd[j][o] = mema[j][o] + memb[j][o]; + memd[j][0] = mema[j][0] + memb[j][0]; } + for (i = 0; i < repeats; i++) for (j = 0; j < n; j++) - accu += memd[j][o]; + accu += memd[j][0]; + return accu; } @@ -57,31 +58,36 @@ touch_mem (guint64 block_size, guint64 n_blocks, guint64 repeats) { - guint64 j, accu, n = n_blocks; GTimer *timer; - guint **memc; - guint **memb; - guint **mema = g_new (guint*, n); + guint **mema, **memb, **memc; + guint64 j, accu, n = n_blocks; + + mema = g_new (guint*, n); for (j = 0; j < n; j++) mema[j] = g_slice_alloc (block_size); + memb = g_new (guint*, n); for (j = 0; j < n; j++) memb[j] = g_slice_alloc (block_size); + memc = g_new (guint*, n); for (j = 0; j < n; j++) memc[j] = g_slice_alloc (block_size); timer = g_timer_new(); + fill_memory (mema, n, 2); fill_memory (memb, n, 3); fill_memory (memc, n, 4); + access_memory3 (mema, memb, memc, n, 3); + g_timer_start (timer); accu = access_memory3 (mema, memb, memc, n, repeats); g_timer_stop (timer); - g_print ("Access-time = %fs\n", g_timer_elapsed (timer, NULL)); - g_assert (accu / repeats == (2 + 3) * n / 2 + 4 * n / 2); + g_test_message ("Access-time = %fs", g_timer_elapsed (timer, NULL)); + g_assert_cmpuint (accu / repeats, ==, (2 + 3) * n / 2 + 4 * n / 2); for (j = 0; j < n; j++) { @@ -89,6 +95,7 @@ touch_mem (guint64 block_size, g_slice_free1 (block_size, memb[j]); g_slice_free1 (block_size, memc[j]); } + g_timer_destroy (timer); g_free (mema); g_free (memb); @@ -96,82 +103,31 @@ touch_mem (guint64 block_size, } static void -usage (void) +test_slice_colors (void) { - g_print ("Usage: slice-color [memory-size] [repeats] [colorization]\n"); + guint64 block_size = 512; + guint64 area_size = 1024 * 1024; + guint64 n_blocks, repeats = 1000000; + + /* figure number of blocks from block and area size. + * divide area by 3 because touch_mem() allocates 3 areas */ + n_blocks = area_size / 3 / ALIGN (block_size, sizeof (gsize) * 2); + + g_test_message ("Allocate and touch %" G_GUINT64_FORMAT + " blocks of %" G_GUINT64_FORMAT " bytes" + " (= %" G_GUINT64_FORMAT " bytes) %" G_GUINT64_FORMAT + " times with color increment", + n_blocks, block_size, n_blocks * block_size, repeats); + + touch_mem (block_size, n_blocks, repeats); } int -main (int argc, - char *argv[]) +main (int argc, char **argv) { - guint64 block_size = 512, area_size = 1024 * 1024, n_blocks, repeats = 1000000; + g_test_init (&argc, &argv, NULL); - if (argc > 1) - block_size = parse_memsize (argv[1]); - else - { - usage(); - block_size = 512; - } - if (argc > 2) - area_size = parse_memsize (argv[2]); - if (argc > 3) - repeats = parse_memsize (argv[3]); - if (argc > 4) - g_slice_set_config (G_SLICE_CONFIG_COLOR_INCREMENT, parse_memsize (argv[4])); + g_test_add_func ("/slice/colors", test_slice_colors); - /* figure number of blocks from block and area size. - * divide area by 3 because touch_mem() allocates 3 areas - */ - n_blocks = area_size / 3 / ALIGN (block_size, sizeof (gsize) * 2); - - /* basic sanity checks */ - if (!block_size || !n_blocks || block_size >= area_size) - { - g_printerr ("Invalid arguments: block-size=%" G_GUINT64_FORMAT " memory-size=%" G_GUINT64_FORMAT "\n", block_size, area_size); - usage(); - return 1; - } - - g_printerr ("Will allocate and touch %" G_GUINT64_FORMAT " blocks of %" G_GUINT64_FORMAT " bytes (= %" G_GUINT64_FORMAT " bytes) %" G_GUINT64_FORMAT " times with color increment: 0x%08" G_GINT64_MODIFIER "x\n", - n_blocks, block_size, n_blocks * block_size, repeats, - (guint64)g_slice_get_config (G_SLICE_CONFIG_COLOR_INCREMENT)); - - touch_mem (block_size, n_blocks, repeats); - - return 0; -} - -static gdouble -parse_memsize (const gchar *cstring) -{ - gchar *mem = g_strdup (cstring); - gchar *string = g_strstrip (mem); - guint l = strlen (string); - gdouble f = 0; - gchar *derr = NULL; - gdouble msize; - - switch (l ? string[l - 1] : 0) - { - case 'k': f = 1000; break; - case 'K': f = 1024; break; - case 'm': f = 1000000; break; - case 'M': f = 1024 * 1024; break; - case 'g': f = 1000000000; break; - case 'G': f = 1024 * 1024 * 1024; break; - } - if (f) - string[l - 1] = 0; - msize = g_ascii_strtod (string, &derr); - g_free (mem); - if (derr && *derr) - { - g_printerr ("failed to parse number at: %s\n", derr); - msize = 0; - } - if (f) - msize *= f; - return msize; + return g_test_run (); } From 1f2f3d7f37ef75cfc9f324a08bb929b5e1341ceb Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Sun, 20 Mar 2022 20:00:48 +0100 Subject: [PATCH 3/4] Convert tests/slice-concurrent.c to glib test framework --- tests/slice-concurrent.c | 66 ++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/tests/slice-concurrent.c b/tests/slice-concurrent.c index 66f055265..4551e20dc 100644 --- a/tests/slice-concurrent.c +++ b/tests/slice-concurrent.c @@ -15,19 +15,18 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#include -#include -#ifdef G_OS_UNIX -#include -#endif -#define N_THREADS 8 -#define N_ALLOCS 50000 +#include + +#include + +#define N_THREADS 8 +#define N_ALLOCS 50000 #define MAX_BLOCK_SIZE 64 struct ThreadData { - int thread_id; + int thread_id; GThread* gthread; GMutex to_free_mutex; @@ -40,25 +39,23 @@ struct ThreadData static void * thread_func (void *arg) { - struct ThreadData *td = arg; int i; -/* g_print ("Thread %d starting\n", td->thread_id); */ + struct ThreadData *td = arg; + for (i = 0; i < N_ALLOCS; i++) { - int bytes; + int bytes, f, t; char *mem; - int f; - int t; if (rand() % (N_ALLOCS / 20) == 0) - g_print ("%c", 'a' - 1 + td->thread_id); + g_test_message ("%c", 'a' - 1 + td->thread_id); /* allocate block of random size and randomly fill */ bytes = rand() % MAX_BLOCK_SIZE + 1; mem = g_slice_alloc (bytes); for (f = 0; f < bytes; f++) - mem[f] = rand(); + mem[f] = rand(); /* associate block with random thread */ t = rand() % N_THREADS; @@ -80,19 +77,20 @@ thread_func (void *arg) /* free a block associated with this thread */ g_mutex_lock (&td->to_free_mutex); if (td->n_to_free > 0) - { - td->n_to_free--; - g_slice_free1 (td->bytes_to_free[td->n_to_free], td->to_free[td->n_to_free]); - td->n_freed++; - } + { + td->n_to_free--; + g_slice_free1 (td->bytes_to_free[td->n_to_free], + td->to_free[td->n_to_free]); + td->n_freed++; + } g_mutex_unlock (&td->to_free_mutex); } return NULL; } -int -main (void) +static void +test_concurrent_slice (void) { int t; @@ -102,21 +100,31 @@ main (void) tdata[t].n_to_free = 0; tdata[t].n_freed = 0; } - g_print ("Starting %d threads for concurrent GSlice usage...\n", N_THREADS); + for (t = 0; t < N_THREADS; t++) { - tdata[t].gthread = g_thread_create (thread_func, &tdata[t], TRUE, NULL); - g_assert (tdata[t].gthread != NULL); + tdata[t].gthread = g_thread_new (NULL, thread_func, &tdata[t]); + g_assert_nonnull (tdata[t].gthread); } + for (t = 0; t < N_THREADS; t++) { g_thread_join (tdata[t].gthread); } - g_print ("\n"); + for (t = 0; t < N_THREADS; t++) { - g_print ("Thread %d: %d blocks freed, %d blocks not freed\n", - tdata[t].thread_id, tdata[t].n_freed, tdata[t].n_to_free); + g_test_message ("Thread %d: %d blocks freed, %d blocks not freed", + tdata[t].thread_id, tdata[t].n_freed, tdata[t].n_to_free); } - return 0; +} + +int +main (int argc, char **argv) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/slice/concurrent", test_concurrent_slice); + + return g_test_run (); } From 5931ed8c2b417f337f3bc356f0d42fa60bb03d17 Mon Sep 17 00:00:00 2001 From: Emmanuel Fleury Date: Sun, 20 Mar 2022 23:33:17 +0100 Subject: [PATCH 4/4] Move test files on slices from tests/ to glib/tests/ slice-color.c and slice-concurrent.c are moved from tests/ to glib/tests/ Related to issue #1434 --- glib/tests/meson.build | 4 ++++ {tests => glib/tests}/slice-color.c | 0 {tests => glib/tests}/slice-concurrent.c | 0 tests/meson.build | 4 ---- 4 files changed, 4 insertions(+), 4 deletions(-) rename {tests => glib/tests}/slice-color.c (100%) rename {tests => glib/tests}/slice-concurrent.c (100%) diff --git a/glib/tests/meson.build b/glib/tests/meson.build index d05c0b5c4..301158e0f 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build @@ -98,6 +98,10 @@ glib_tests = { }, 'shell' : {}, 'slice' : {}, + 'slice-color' : { + 'extra_sources' : ['memchunks.c'], + }, + 'slice-concurrent' : {}, 'slist' : {}, 'sort' : {}, 'spawn-multithreaded' : {}, diff --git a/tests/slice-color.c b/glib/tests/slice-color.c similarity index 100% rename from tests/slice-color.c rename to glib/tests/slice-color.c diff --git a/tests/slice-concurrent.c b/glib/tests/slice-concurrent.c similarity index 100% rename from tests/slice-concurrent.c rename to glib/tests/slice-concurrent.c diff --git a/tests/meson.build b/tests/meson.build index 091f77ac5..c95fa1d00 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -20,10 +20,6 @@ tests = { 'mainloop-test' : {}, 'mapping-test' : {}, 'onceinit' : {}, - 'slice-color' : { - 'extra_sources' : ['memchunks.c'], - }, - 'slice-concurrent' : {}, 'slice-threadinit' : { 'dependencies' : [libgthread_dep], },