luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-28 01:57:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Stop using GStaticMutex in two testcases

Browse Source
This commit is contained in:
Ryan Lortie
2011-09-17 19:33:30 -04:00
parent 1da913a7a3
commit c33cd00739
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gthread/tests/gwakeuptest.c
View File

@@ -78,7 +78,7 @@ struct token
struct context
{
GSList *pending_tokens;
GStaticMutex lock;
GMutex lock;
GWakeup *wakeup;
gboolean quit;
};
@@ -95,10 +95,8 @@ static volatile gint tokens_alive;
static void
context_init (struct context *ctx)
{
GStaticMutex lock = G_STATIC_MUTEX_INIT;
ctx->pending_tokens = NULL;
ctx->lock = lock;
g_mutex_init (&ctx->lock);
ctx->wakeup = g_wakeup_new ();
ctx->quit = FALSE;
}
@@ -124,11 +122,11 @@ context_pop_token (struct context *ctx)
{
struct token *token;
g_static_mutex_lock (&ctx->lock);
g_mutex_lock (&ctx->lock);
token = ctx->pending_tokens->data;
ctx->pending_tokens = g_slist_remove_link (ctx->pending_tokens,
ctx->pending_tokens);
g_static_mutex_unlock (&ctx->lock);
g_mutex_unlock (&ctx->lock);
return token;
}
@@ -139,9 +137,9 @@ context_push_token (struct context *ctx,
{
g_assert (token->owner == ctx);
g_static_mutex_lock (&ctx->lock);
g_mutex_lock (&ctx->lock);
ctx->pending_tokens = g_slist_prepend (ctx->pending_tokens, token);
g_static_mutex_unlock (&ctx->lock);
g_mutex_unlock (&ctx->lock);
g_wakeup_signal (ctx->wakeup);
}