Attachment 43813 Details for Bug 34570 – Attempt to reproduce fd.o #34393 via another regression test

[patch] Attempt to reproduce fd.o #34393 via another regression test

0007-Attempt-to-reproduce-fd.o-34393-via-another-regressi.patch (text/plain), 9.98 KB, created by Simon McVittie on 2011-02-25 10:19:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-02-25 10:19:56 UTC

Size: 9.98 KB

patch

obsolete

>From e18958f57b82d7349de37d71525ffb2b8686a060 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 22 Feb 2011 16:32:14 +0000
>Subject: [PATCH 7/7] Attempt to reproduce fd.o #34393 via another regression test
>
>---
> test/.gitignore  |    1 +
> test/Makefile.am |   10 ++-
> test/relay.c     |  318 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 328 insertions(+), 1 deletions(-)
> create mode 100644 test/relay.c
>
>diff --git a/test/.gitignore b/test/.gitignore
>index e67d1b9..b329d58 100644
>--- a/test/.gitignore
>+++ b/test/.gitignore
>@@ -24,3 +24,4 @@ shell-test
> test-shell-service
> test-names
> test-loopback
>+test-relay
>diff --git a/test/Makefile.am b/test/Makefile.am
>index a6b83b6..0ec176e 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -73,7 +73,8 @@ spawn_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
> EXTRA_DIST=
> 
> modular_tests = \
>-	test-loopback
>+	test-loopback \
>+	test-relay
> 
> test_loopback_SOURCES = loopback.c
> test_loopback_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
>@@ -82,6 +83,13 @@ test_loopback_LDADD = $(top_builddir)/dbus/libdbus-1.la \
>     $(GLIB_LIBS) \
>     $(DBUS_GLIB_LIBS)
> 
>+test_relay_SOURCES = relay.c
>+test_relay_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
>+test_relay_LDFLAGS = @R_DYNAMIC_LDFLAG@
>+test_relay_LDADD = $(top_builddir)/dbus/libdbus-1.la \
>+    $(GLIB_LIBS) \
>+    $(DBUS_GLIB_LIBS)
>+
> if DBUS_ENABLE_MODULAR_TESTS
> noinst_PROGRAMS += $(modular_tests)
> TESTS += $(modular_tests)
>diff --git a/test/relay.c b/test/relay.c
>new file mode 100644
>index 0000000..b35ed9d
>--- /dev/null
>+++ b/test/relay.c
>@@ -0,0 +1,318 @@
>+/* Regression test for passing unmodified messages between connections
>+ *
>+ * Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
>+ * Copyright Â© 2010 Nokia Corporation
>+ *
>+ * Permission is hereby granted, free of charge, to any person
>+ * obtaining a copy of this software and associated documentation files
>+ * (the "Software"), to deal in the Software without restriction,
>+ * including without limitation the rights to use, copy, modify, merge,
>+ * publish, distribute, sublicense, and/or sell copies of the Software,
>+ * and to permit persons to whom the Software is furnished to do so,
>+ * subject to the following conditions:
>+ *
>+ * The above copyright notice and this permission notice shall be
>+ * included in all copies or substantial portions of the Software.
>+ *
>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
>+ * SOFTWARE.
>+ */
>+
>+#include <config.h>
>+
>+#include <glib.h>
>+
>+#include <dbus/dbus.h>
>+#include <dbus/dbus-glib-lowlevel.h>
>+
>+/* This is basically a miniature dbus-daemon. We relay messages from the client
>+ * on the left to the client on the right.
>+ *
>+ * left      socket     left      dispatch     right    socket     right
>+ * client ===========>  server --------------> server ===========> client
>+ * conn                 conn                   conn                conn
>+ *
>+ * In the real dbus-daemon, the client connections would be out-of-process,
>+ * but here we're cheating and doing everything in-process.
>+ */
>+
>+typedef struct {
>+    DBusError e;
>+
>+    DBusServer *server;
>+
>+    DBusConnection *left_client_conn;
>+    DBusConnection *left_server_conn;
>+
>+    DBusConnection *right_server_conn;
>+    DBusConnection *right_client_conn;
>+    /* queue of DBusMessage received by right_client_conn */
>+    GQueue messages;
>+} Fixture;
>+
>+static void
>+assert_no_error (const DBusError *e)
>+{
>+  if (G_UNLIKELY (dbus_error_is_set (e)))
>+    g_error ("expected success but got error: %s: %s", e->name, e->message);
>+}
>+
>+static DBusHandlerResult
>+server_message_cb (DBusConnection *server_conn,
>+    DBusMessage *message,
>+    void *data)
>+{
>+  Fixture *f = data;
>+
>+  g_assert (server_conn == f->left_server_conn);
>+  g_assert (f->right_server_conn != NULL);
>+
>+  dbus_connection_send (f->right_server_conn, message, NULL);
>+
>+  return DBUS_HANDLER_RESULT_HANDLED;
>+}
>+
>+static DBusHandlerResult
>+right_client_message_cb (DBusConnection *client_conn,
>+    DBusMessage *message,
>+    void *data)
>+{
>+  Fixture *f = data;
>+
>+  g_assert (client_conn == f->right_client_conn);
>+  g_queue_push_tail (&f->messages, dbus_message_ref (message));
>+
>+  return DBUS_HANDLER_RESULT_HANDLED;
>+}
>+
>+static void
>+new_conn_cb (DBusServer *server,
>+    DBusConnection *server_conn,
>+    void *data)
>+{
>+  Fixture *f = data;
>+  dbus_bool_t have_mem;
>+
>+  if (f->left_server_conn == NULL)
>+    {
>+      f->left_server_conn = dbus_connection_ref (server_conn);
>+
>+      have_mem = dbus_connection_add_filter (server_conn,
>+          server_message_cb, f, NULL);
>+      g_assert (have_mem);
>+    }
>+  else
>+    {
>+      g_assert (f->right_server_conn == NULL);
>+      f->right_server_conn = dbus_connection_ref (server_conn);
>+    }
>+
>+  dbus_connection_setup_with_g_main (server_conn, NULL);
>+}
>+
>+static void
>+setup (Fixture *f,
>+    gconstpointer data G_GNUC_UNUSED)
>+{
>+  dbus_error_init (&f->e);
>+  g_queue_init (&f->messages);
>+
>+  f->server = dbus_server_listen ("tcp:host=127.0.0.1", &f->e);
>+  assert_no_error (&f->e);
>+  g_assert (f->server != NULL);
>+
>+  dbus_server_set_new_connection_function (f->server,
>+      new_conn_cb, f, NULL);
>+  dbus_server_setup_with_g_main (f->server, NULL);
>+}
>+
>+static void
>+test_connect (Fixture *f,
>+    gconstpointer data G_GNUC_UNUSED)
>+{
>+  dbus_bool_t have_mem;
>+
>+  g_assert (f->left_server_conn == NULL);
>+  g_assert (f->right_server_conn == NULL);
>+
>+  f->left_client_conn = dbus_connection_open_private (
>+      dbus_server_get_address (f->server), &f->e);
>+  assert_no_error (&f->e);
>+  g_assert (f->left_client_conn != NULL);
>+  dbus_connection_setup_with_g_main (f->left_client_conn, NULL);
>+
>+  while (f->left_server_conn == NULL)
>+    {
>+      g_print (".");
>+      g_main_context_iteration (NULL, TRUE);
>+    }
>+
>+  f->right_client_conn = dbus_connection_open_private (
>+      dbus_server_get_address (f->server), &f->e);
>+  assert_no_error (&f->e);
>+  g_assert (f->right_client_conn != NULL);
>+  dbus_connection_setup_with_g_main (f->right_client_conn, NULL);
>+
>+  while (f->right_server_conn == NULL)
>+    {
>+      g_print (".");
>+      g_main_context_iteration (NULL, TRUE);
>+    }
>+
>+  have_mem = dbus_connection_add_filter (f->right_client_conn,
>+      right_client_message_cb, f, NULL);
>+  g_assert (have_mem);
>+}
>+
>+static dbus_uint32_t
>+send_one (Fixture *f,
>+    const char *member)
>+{
>+  dbus_bool_t have_mem;
>+  dbus_uint32_t serial;
>+  DBusMessage *outgoing;
>+
>+  outgoing = dbus_message_new_signal ("/com/example/Hello",
>+      "com.example.Hello", member);
>+  g_assert (outgoing != NULL);
>+
>+  have_mem = dbus_connection_send (f->left_client_conn, outgoing, &serial);
>+  g_assert (have_mem);
>+  g_assert (serial != 0);
>+
>+  dbus_message_unref (outgoing);
>+  return serial;
>+}
>+
>+static void
>+test_relay (Fixture *f,
>+    gconstpointer data)
>+{
>+  DBusMessage *incoming;
>+
>+  test_connect (f, data);
>+
>+  send_one (f, "First");
>+  send_one (f, "Second");
>+
>+  while (g_queue_get_length (&f->messages) < 2)
>+    {
>+      g_print (".");
>+      g_main_context_iteration (NULL, TRUE);
>+    }
>+
>+  g_assert_cmpuint (g_queue_get_length (&f->messages), ==, 2);
>+
>+  incoming = g_queue_pop_head (&f->messages);
>+  g_assert_cmpstr (dbus_message_get_member (incoming), ==, "First");
>+  dbus_message_unref (incoming);
>+
>+  incoming = g_queue_pop_head (&f->messages);
>+  g_assert_cmpstr (dbus_message_get_member (incoming), ==, "Second");
>+  dbus_message_unref (incoming);
>+}
>+
>+/* An arbitrary number of messages */
>+#define MANY 8192
>+
>+static void
>+test_limit (Fixture *f,
>+    gconstpointer data)
>+{
>+  DBusMessage *incoming;
>+  guint i;
>+
>+  test_connect (f, data);
>+
>+  /* This was an attempt to reproduce fd.o #34393. It didn't work. */
>+  g_test_bug ("34393");
>+  dbus_connection_set_max_received_size (f->left_server_conn, 1);
>+  g_main_context_iteration (NULL, TRUE);
>+
>+  for (i = 0; i < MANY; i++)
>+    {
>+      gchar *buf = g_strdup_printf ("Message%u", i);
>+
>+      send_one (f, buf);
>+      g_free (buf);
>+    }
>+
>+  i = 0;
>+
>+  while (i < MANY)
>+    {
>+      while (g_queue_is_empty (&f->messages))
>+        {
>+          g_main_context_iteration (NULL, TRUE);
>+        }
>+
>+      while ((incoming = g_queue_pop_head (&f->messages)) != NULL)
>+        {
>+          i++;
>+          dbus_message_unref (incoming);
>+        }
>+    }
>+}
>+
>+static void
>+teardown (Fixture *f,
>+    gconstpointer data G_GNUC_UNUSED)
>+{
>+  if (f->left_client_conn != NULL)
>+    {
>+      dbus_connection_close (f->left_client_conn);
>+      dbus_connection_unref (f->left_client_conn);
>+      f->left_client_conn = NULL;
>+    }
>+
>+  if (f->right_client_conn != NULL)
>+    {
>+      dbus_connection_close (f->right_client_conn);
>+      dbus_connection_unref (f->right_client_conn);
>+      f->right_client_conn = NULL;
>+    }
>+
>+  if (f->left_server_conn != NULL)
>+    {
>+      dbus_connection_close (f->left_server_conn);
>+      dbus_connection_unref (f->left_server_conn);
>+      f->left_server_conn = NULL;
>+    }
>+
>+  if (f->right_server_conn != NULL)
>+    {
>+      dbus_connection_close (f->right_server_conn);
>+      dbus_connection_unref (f->right_server_conn);
>+      f->right_server_conn = NULL;
>+    }
>+
>+  if (f->server != NULL)
>+    {
>+      dbus_server_disconnect (f->server);
>+      dbus_server_unref (f->server);
>+      f->server = NULL;
>+    }
>+}
>+
>+int
>+main (int argc,
>+    char **argv)
>+{
>+  g_test_init (&argc, &argv, NULL);
>+  g_test_bug_base ("https://bugs.freedesktop.org/show_bug.cgi?id=");
>+
>+  g_test_add ("/connect", Fixture, NULL, setup,
>+      test_connect, teardown);
>+  g_test_add ("/relay", Fixture, NULL, setup,
>+      test_relay, teardown);
>+  g_test_add ("/limit", Fixture, NULL, setup,
>+      test_limit, teardown);
>+
>+  return g_test_run ();
>+}
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 34570: 43658 | 43659 | 43660 | 43661 | 43812 | 43813 | 44349 | 44351 | 44352 | 47723 | 47724 | 47725 | 47816 | 47817

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.