luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Move /thread/rec-mutex3 test state into a struct

Browse Source 
And dynamically allocate the arrays. This will allow the scale of the
test to be configured in the following commit, which will allow it to be
tweaked to not time out on slow CI runners.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2023-06-01 12:12:38 +01:00
parent 9db8765e21
commit add5fceedb
1 changed files with 54 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
glib/tests/rec-mutex.c
View File

@ -71,66 +71,76 @@ test_rec_mutex3 (void)
g_rec_mutex_unlock (&mutex);
}
#define LOCKS 48
#define ITERATIONS 10000
#define THREADS 100
GThread *owners[LOCKS];
GRecMutex locks[LOCKS];
typedef struct {
size_t n_locks;
unsigned int n_iterations;
size_t n_threads;
GThread **threads; /* (array length=n_threads) */
GThread **owners; /* (array length=n_locks), each element is locked by the corresponding mutex in @locks */
GRecMutex *locks; /* (array length=n_locks) */
} ThreadTestData;
static void
acquire (gint nr)
thread_test_data_clear (ThreadTestData *data)
{
g_free (data->locks);
g_free (data->owners);
g_free (data->threads);
}
static void
acquire (ThreadTestData *data,
unsigned int nr)
{
GThread *self;
self = g_thread_self ();
if (!g_rec_mutex_trylock (&locks[nr]))
if (!g_rec_mutex_trylock (&data->locks[nr]))
{
if (g_test_verbose ())
g_printerr ("thread %p going to block on lock %d\n", self, nr);
g_rec_mutex_lock (&locks[nr]);
g_rec_mutex_lock (&data->locks[nr]);
}
g_assert_null (owners[nr]); /* hopefully nobody else is here */
owners[nr] = self;
g_assert_null (data->owners[nr]); /* hopefully nobody else is here */
data->owners[nr] = self;
/* let some other threads try to ruin our day */
g_thread_yield ();
g_thread_yield ();
g_assert_true (owners[nr] == self); /* hopefully this is still us... */
g_assert_true (data->owners[nr] == self); /* hopefully this is still us... */
if (g_test_verbose ())
g_printerr ("thread %p recursively taking lock %d\n", self, nr);
g_rec_mutex_lock (&locks[nr]); /* we're recursive, after all */
g_rec_mutex_lock (&data->locks[nr]); /* we're recursive, after all */
g_assert_true (owners[nr] == self); /* hopefully this is still us... */
g_assert_true (data->owners[nr] == self); /* hopefully this is still us... */
g_rec_mutex_unlock (&locks[nr]);
g_rec_mutex_unlock (&data->locks[nr]);
g_thread_yield ();
g_thread_yield ();
g_assert_true (owners[nr] == self); /* hopefully this is still us... */
owners[nr] = NULL; /* make way for the next guy */
g_assert_true (data->owners[nr] == self); /* hopefully this is still us... */
data->owners[nr] = NULL; /* make way for the next guy */
g_rec_mutex_unlock (&locks[nr]);
g_rec_mutex_unlock (&data->locks[nr]);
}
static gpointer
thread_func (gpointer data)
thread_func (gpointer user_data)
{
gint i;
ThreadTestData *data = user_data;
GRand *rand;
rand = g_rand_new ();
for (i = 0; i < ITERATIONS; i++)
acquire (g_rand_int_range (rand, 0, LOCKS));
for (unsigned int i = 0; i < data->n_iterations; i++)
acquire (data, g_rand_int_range (rand, 0, data->n_locks));
g_rand_free (rand);
@ -140,23 +150,31 @@ thread_func (gpointer data)
static void
test_rec_mutex4 (void)
{
gint i;
GThread *threads[THREADS];
ThreadTestData data;
for (i = 0; i < LOCKS; i++)
g_rec_mutex_init (&locks[i]);
data.n_locks = 48;
data.n_iterations = 10000;
data.n_threads = 100;
data.threads = g_new0 (GThread*, data.n_threads);
data.owners = g_new0 (GThread*, data.n_locks);
data.locks = g_new0 (GRecMutex, data.n_locks);
for (i = 0; i < THREADS; i++)
threads[i] = g_thread_new ("test", thread_func, NULL);
for (size_t i = 0; i < data.n_locks; i++)
g_rec_mutex_init (&data.locks[i]);
for (i = 0; i < THREADS; i++)
g_thread_join (threads[i]);
for (size_t i = 0; i < data.n_threads; i++)
data.threads[i] = g_thread_new ("test", thread_func, &data);
for (i = 0; i < LOCKS; i++)
g_rec_mutex_clear (&locks[i]);
for (size_t i = 0; i < data.n_threads; i++)
g_thread_join (data.threads[i]);
for (i = 0; i < LOCKS; i++)
g_assert_null (owners[i]);
for (size_t i = 0; i < data.n_locks; i++)
g_rec_mutex_clear (&data.locks[i]);
for (size_t i = 0; i < data.n_locks; i++)
g_assert_null (data.owners[i]);
thread_test_data_clear (&data);
}
static gint count_to = 0;
@ -195,7 +213,7 @@ static void
test_mutex_perf (gconstpointer data)
{
gint c = GPOINTER_TO_INT (data);
GThread *threads[THREADS];
GThread *threads[100];
gint64 start_time;
gint n_threads;
gdouble rate;