luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 15:03:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove g_mutex_new()/g_cond_new() in testcases

Browse Source 
These were the last users of the dynamic allocation API.

Keep the uses in glib/tests/mutex.c since this is actually meant to test
the API (which has to continue working, even if it is deprecated).

https://bugzilla.gnome.org/show_bug.cgi?id=660739
This commit is contained in:
Ryan Lortie
2011-10-04 19:04:41 -04:00
parent 9793708931
commit 6f343ca548
10 changed files with 97 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/slice-concurrent.c
View File

@@ -30,7 +30,7 @@ struct ThreadData
int thread_id;
GThread* gthread;
GMutex* to_free_mutex;
GMutex to_free_mutex;
void* to_free [N_THREADS * N_ALLOCS];
int bytes_to_free [N_THREADS * N_ALLOCS];
int n_to_free;
@@ -57,11 +57,11 @@ thread_func (void *arg)
/* associate block with random thread */
int t = rand() % N_THREADS;
g_mutex_lock (tdata[t].to_free_mutex);
g_mutex_lock (&tdata[t].to_free_mutex);
tdata[t].to_free[tdata[t].n_to_free] = mem;
tdata[t].bytes_to_free[tdata[t].n_to_free] = bytes;
tdata[t].n_to_free++;
g_mutex_unlock (tdata[t].to_free_mutex);
g_mutex_unlock (&tdata[t].to_free_mutex);
/* shuffle thread execution order every once in a while */
if (rand() % 97 == 0)
@@ -73,14 +73,14 @@ thread_func (void *arg)
}
/* free a block associated with this thread */
g_mutex_lock (td->to_free_mutex);
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++;
}
g_mutex_unlock (td->to_free_mutex);
g_mutex_unlock (&td->to_free_mutex);
}
return NULL;
@@ -91,14 +91,11 @@ main()
{
int t;
g_thread_init (NULL);
for (t = 0; t < N_THREADS; t++)
{
tdata[t].thread_id = t + 1;
tdata[t].n_to_free = 0;
tdata[t].n_freed = 0;
tdata[t].to_free_mutex = g_mutex_new();
}
g_print ("Starting %d threads for concurrent GSlice usage...\n", N_THREADS);
for (t = 0; t < N_THREADS; t++)