Attachment 118983 Details for Bug 92538 – [4/4] refs test: reduce number of repeats under Wine

[patch] [4/4] refs test: reduce number of repeats under Wine

0006-refs-test-reduce-number-of-repeats-under-Wine.patch (text/plain), 8.39 KB, created by Simon McVittie on 2015-10-19 15:16:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2015-10-19 15:16:44 UTC

Size: 8.39 KB

patch

obsolete

>From a68ccf65164e7838c3d0f40b1f547d660f3b4916 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 19 Oct 2015 16:04:40 +0100
>Subject: [PATCH 6/6] refs test: reduce number of repeats under Wine
>
>Under Wine, the API calls we use to do this are implemented via IPC
>to wineserver, which makes it unreasonably slow to try to brute-force
>bugs by having many threads stress-test refcounting. Do a few
>repetitions just to verify that refcounting basically works, but
>don't do the full stress-test.
>---
> test/internals/refs.c | 99 ++++++++++++++++++++++++++++++++++-----------------
> 1 file changed, 67 insertions(+), 32 deletions(-)
>
>diff --git a/test/internals/refs.c b/test/internals/refs.c
>index 7eae44e..455ae52 100644
>--- a/test/internals/refs.c
>+++ b/test/internals/refs.c
>@@ -62,12 +62,15 @@ typedef struct {
>   DBusMessage *message;
>   GThread *threads[N_THREADS];
>   gboolean last_unref;
>+  unsigned n_refs;
>+  unsigned n_threads;
> } Fixture;
> 
> typedef void *(*RefFunc) (void *);
> typedef void (*VoidFunc) (void *);
> 
> typedef struct {
>+  const Fixture *f;
>   void *thing;
>   RefFunc ref;
>   VoidFunc ref_void;
>@@ -86,9 +89,10 @@ static gpointer
> ref_thread (gpointer data)
> {
>   Thread *thread = data;
>-  int i;
>+  const Fixture *f = thread->f;
>+  unsigned i;
> 
>-  for (i = 0; i < N_REFS; i++)
>+  for (i = 0; i < f->n_refs; i++)
>     {
>       if (thread->lock != NULL)
>         (thread->lock) (thread->mutex);
>@@ -115,9 +119,10 @@ static gpointer
> cycle_thread (gpointer data)
> {
>   Thread *thread = data;
>-  int i;
>+  const Fixture *f = thread->f;
>+  unsigned i;
> 
>-  for (i = 0; i < N_REFS; i++)
>+  for (i = 0; i < f->n_refs; i++)
>     {
>       if (thread->lock != NULL)
>         (thread->lock) (thread->mutex);
>@@ -146,9 +151,10 @@ static gpointer
> unref_thread (gpointer data)
> {
>   Thread *thread = data;
>-  int i;
>+  const Fixture *f = thread->f;
>+  unsigned i;
> 
>-  for (i = 0; i < N_REFS; i++)
>+  for (i = 0; i < f->n_refs; i++)
>     {
>       if (thread->lock != NULL)
>         (thread->lock) (thread->mutex);
>@@ -174,9 +180,9 @@ last_unref (void *data)
> static void
> wait_for_all_threads (Fixture *f)
> {
>-  int i;
>+  unsigned i;
> 
>-  for (i = 0; i < N_THREADS; i++)
>+  for (i = 0; i < f->n_threads; i++)
>     g_thread_join (f->threads[i]);
> }
> 
>@@ -200,6 +206,19 @@ setup (Fixture *f,
>   if (!dbus_threads_init_default ())
>     g_error ("OOM");
> 
>+  f->n_threads = N_THREADS;
>+  f->n_refs = N_REFS;
>+
>+  if (g_getenv ("WINESERVERSOCKET") != NULL)
>+    {
>+      /* Our reference-counting is really slow under Wine (it involves
>+       * IPC to wineserver). Do fewer iterations: enough to demonstrate
>+       * that it works, rather than a performance test.
>+       */
>+      f->n_threads = 10;
>+      f->n_refs = 10;
>+    }
>+
>   f->loop = _dbus_loop_new ();
>   g_assert (f->loop != NULL);
> 
>@@ -257,28 +276,32 @@ static void
> test_connection (Fixture *f,
>     gconstpointer data)
> {
>-  Thread public_api = { f->connection,
>+  Thread public_api = {
>+    f,
>+    f->connection,
>     (RefFunc) dbus_connection_ref,
>     NULL,
>     (VoidFunc) dbus_connection_unref,
>     NULL,
>     NULL,
>     NULL };
>-  Thread internal_api = { f->connection,
>+  Thread internal_api = {
>+    f,
>+    f->connection,
>     (RefFunc) _dbus_connection_ref_unlocked,
>     NULL,
>     (VoidFunc) _dbus_connection_unref_unlocked,
>     f->connection,
>     (VoidFunc) _dbus_connection_lock,
>     (VoidFunc) _dbus_connection_unlock };
>-  int i;
>+  unsigned i;
> 
>   /* Use a slot as a pseudo-weakref */
>   if (!dbus_connection_set_data (f->connection, connection_slot, f,
>         last_unref))
>     g_error ("OOM");
> 
>-  for (i = 0; i < N_THREADS; i++)
>+  for (i = 0; i < f->n_threads; i++)
>     {
>       if ((i % 2) == 0)
>         f->threads[i] = g_thread_new (NULL, ref_thread, &public_api);
>@@ -290,7 +313,7 @@ test_connection (Fixture *f,
> 
>   wait_for_all_threads (f);
> 
>-  for (i = 0; i < N_THREADS; i++)
>+  for (i = 0; i < f->n_threads; i++)
>     {
>       if ((i % 2) == 0)
>         f->threads[i] = g_thread_new (NULL, cycle_thread, &public_api);
>@@ -302,7 +325,7 @@ test_connection (Fixture *f,
> 
>   wait_for_all_threads (f);
> 
>-  for (i = 0; i < N_THREADS; i++)
>+  for (i = 0; i < f->n_threads; i++)
>     {
>       if ((i % 2) == 0)
>         f->threads[i] = g_thread_new (NULL, unref_thread, &public_api);
>@@ -338,26 +361,30 @@ static void
> test_server (Fixture *f,
>     gconstpointer data)
> {
>-  Thread public_api = { f->server,
>+  Thread public_api = {
>+    f,
>+    f->server,
>     (RefFunc) dbus_server_ref,
>     NULL,
>     (VoidFunc) dbus_server_unref,
>     NULL,
>     NULL,
>     NULL };
>-  Thread internal_api = { f->server,
>+  Thread internal_api = {
>+    f,
>+    f->server,
>     NULL,
>     (VoidFunc) _dbus_server_ref_unlocked,
>     (VoidFunc) _dbus_server_unref_unlocked,
>     f->server,
>     server_lock,
>     server_unlock };
>-  int i;
>+  unsigned i;
> 
>   if (!dbus_server_set_data (f->server, server_slot, f, last_unref))
>     g_error ("OOM");
> 
>-  for (i = 0; i < N_THREADS; i++)
>+  for (i = 0; i < f->n_threads; i++)
>     {
>       if ((i % 2) == 0)
>         f->threads[i] = g_thread_new (NULL, ref_thread, &public_api);
>@@ -369,7 +396,7 @@ test_server (Fixture *f,
> 
>   wait_for_all_threads (f);
> 
>-  for (i = 0; i < N_THREADS; i++)
>+  for (i = 0; i < f->n_threads; i++)
>     {
>       if ((i % 2) == 0)
>         f->threads[i] = g_thread_new (NULL, cycle_thread, &public_api);
>@@ -381,7 +408,7 @@ test_server (Fixture *f,
> 
>   wait_for_all_threads (f);
> 
>-  for (i = 0; i < N_THREADS; i++)
>+  for (i = 0; i < f->n_threads; i++)
>     {
>       if ((i % 2) == 0)
>         f->threads[i] = g_thread_new (NULL, unref_thread, &public_api);
>@@ -407,19 +434,21 @@ test_message (Fixture *f,
> {
>   DBusMessage *message = dbus_message_new_signal ("/foo", "foo.bar.baz",
>       "Foo");
>-  Thread public_api = { message,
>+  Thread public_api = {
>+    f,
>+    message,
>     (RefFunc) dbus_message_ref,
>     NULL,
>     (VoidFunc) dbus_message_unref,
>     NULL,
>     NULL,
>     NULL };
>-  int i;
>+  unsigned i;
> 
>   if (!dbus_message_set_data (message, message_slot, f, last_unref))
>     g_error ("OOM");
> 
>-  for (i = 0; i < N_THREADS; i++)
>+  for (i = 0; i < f->n_threads; i++)
>     {
>       f->threads[i] = g_thread_new (NULL, ref_thread, &public_api);
>       g_assert (f->threads[i] != NULL);
>@@ -427,7 +456,7 @@ test_message (Fixture *f,
> 
>   wait_for_all_threads (f);
> 
>-  for (i = 0; i < N_THREADS; i++)
>+  for (i = 0; i < f->n_threads; i++)
>     {
>       f->threads[i] = g_thread_new (NULL, cycle_thread, &public_api);
>       g_assert (f->threads[i] != NULL);
>@@ -435,7 +464,7 @@ test_message (Fixture *f,
> 
>   wait_for_all_threads (f);
> 
>-  for (i = 0; i < N_THREADS; i++)
>+  for (i = 0; i < f->n_threads; i++)
>     {
>       f->threads[i] = g_thread_new (NULL, unref_thread, &public_api);
>       g_assert (f->threads[i] != NULL);
>@@ -453,14 +482,18 @@ static void
> test_pending_call (Fixture *f,
>     gconstpointer data)
> {
>-  Thread public_api = { NULL,
>+  Thread public_api = {
>+    f,
>+    NULL,
>     (RefFunc) dbus_pending_call_ref,
>     NULL,
>     (VoidFunc) dbus_pending_call_unref,
>     NULL,
>     NULL,
>     NULL };
>-  Thread internal_api = { NULL,
>+  Thread internal_api = {
>+    f,
>+    NULL,
>     (RefFunc) _dbus_pending_call_ref_unlocked,
>     NULL,
>     (VoidFunc) dbus_pending_call_unref,
>@@ -468,14 +501,16 @@ test_pending_call (Fixture *f,
>     (VoidFunc) _dbus_connection_lock,
>     (VoidFunc) _dbus_connection_unlock };
>   /* This one can't be used to ref, only to cycle or unref. */
>-  Thread unref_and_unlock_api = { NULL,
>+  Thread unref_and_unlock_api = {
>+    f,
>+    NULL,
>     (RefFunc) _dbus_pending_call_ref_unlocked,
>     NULL,
>     (VoidFunc) _dbus_pending_call_unref_and_unlock,
>     f->connection,
>     (VoidFunc) _dbus_connection_lock,
>     NULL };
>-  int i;
>+  unsigned i;
>   DBusPendingCall *pending_call;
> 
>   _dbus_connection_lock (f->connection);
>@@ -492,7 +527,7 @@ test_pending_call (Fixture *f,
>         last_unref))
>     g_error ("OOM");
> 
>-  for (i = 0; i < N_THREADS; i++)
>+  for (i = 0; i < f->n_threads; i++)
>     {
>       if ((i % 2) == 0)
>         f->threads[i] = g_thread_new (NULL, ref_thread, &public_api);
>@@ -504,7 +539,7 @@ test_pending_call (Fixture *f,
> 
>   wait_for_all_threads (f);
> 
>-  for (i = 0; i < N_THREADS; i++)
>+  for (i = 0; i < f->n_threads; i++)
>     {
>       switch (i % 3)
>         {
>@@ -524,7 +559,7 @@ test_pending_call (Fixture *f,
> 
>   wait_for_all_threads (f);
> 
>-  for (i = 0; i < N_THREADS; i++)
>+  for (i = 0; i < f->n_threads; i++)
>     {
>       switch (i % 3)
>         {
>-- 
>2.6.1
>

Actions: View | Splinter Review

Attachments on bug 92538: 118980 | 118981 | 118982 | 118983 | 118989 | 118990 | 119223

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.