Attachment 16828 Details for Bug 16166 – Add-test-library-functions-for-using-DBusServer.patch

[patch] Add-test-library-functions-for-using-DBusServer.patch

0002-Add-test-library-functions-for-using-DBusServer.patch (text/plain), 5.18 KB, created by Colin Walters on 2008-05-30 08:04:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2008-05-30 08:04:07 UTC

Size: 5.18 KB

patch

obsolete

>From f2a7b1459574a19a759485980e273156817c2878 Mon Sep 17 00:00:00 2001
>From: Colin Walters <walters@verbum.org>
>Date: Fri, 30 May 2008 10:33:18 -0400
>Subject: [PATCH] Add test library functions for using DBusServer
>
>---
> test/test-utils.c |  154 +++++++++++++++++++++++++++++++++++++++++++++++++++++
> test/test-utils.h |    4 ++
> 2 files changed, 158 insertions(+), 0 deletions(-)
>
>diff --git a/test/test-utils.c b/test/test-utils.c
>index 9665eda..d875cc9 100644
>--- a/test/test-utils.c
>+++ b/test/test-utils.c
>@@ -187,3 +187,157 @@ test_connection_shutdown (DBusLoop       *loop,
> 
>   dbus_connection_set_dispatch_status_function (connection, NULL, NULL, NULL);
> }
>+
>+typedef struct
>+{
>+  DBusLoop *loop;
>+  DBusServer *server;
>+} ServerData;
>+
>+static void
>+serverdata_free (void *data)
>+{
>+  ServerData *sd = data;
>+
>+  dbus_server_unref (sd->server);
>+  _dbus_loop_unref (sd->loop);
>+  
>+  dbus_free (sd);
>+}
>+
>+static ServerData*
>+serverdata_new (DBusLoop       *loop,
>+                DBusServer     *server)
>+{
>+  ServerData *sd;
>+
>+  sd = dbus_new0 (ServerData, 1);
>+  if (sd == NULL)
>+    return NULL;
>+
>+  sd->loop = loop;
>+  sd->server = server;
>+
>+  dbus_server_ref (sd->server);
>+  _dbus_loop_ref (sd->loop);
>+
>+  return sd;
>+}
>+
>+static dbus_bool_t
>+server_watch_callback (DBusWatch     *watch,
>+                       unsigned int   condition,
>+                       void          *data)
>+{
>+  /* FIXME this can be done in dbus-mainloop.c
>+   * if the code in activation.c for the babysitter
>+   * watch handler is fixed.
>+   */
>+
>+  return dbus_watch_handle (watch, condition);
>+}
>+
>+static dbus_bool_t
>+add_server_watch (DBusWatch  *watch,
>+                  void       *data)
>+{
>+  ServerData *context = data;
>+
>+  return _dbus_loop_add_watch (context->loop,
>+                               watch, server_watch_callback, context,
>+                               NULL);
>+}
>+
>+static void
>+remove_server_watch (DBusWatch  *watch,
>+                     void       *data)
>+{
>+  ServerData *context = data;
>+  
>+  _dbus_loop_remove_watch (context->loop,
>+                           watch, server_watch_callback, context);
>+}
>+
>+static void
>+server_timeout_callback (DBusTimeout   *timeout,
>+                         void          *data)
>+{
>+  /* can return FALSE on OOM but we just let it fire again later */
>+  dbus_timeout_handle (timeout);
>+}
>+
>+static dbus_bool_t
>+add_server_timeout (DBusTimeout *timeout,
>+                    void        *data)
>+{
>+  ServerData *context = data;
>+
>+  return _dbus_loop_add_timeout (context->loop,
>+                                 timeout, server_timeout_callback, context, NULL);
>+}
>+
>+static void
>+remove_server_timeout (DBusTimeout *timeout,
>+                       void        *data)
>+{
>+  ServerData *context = data;
>+  
>+  _dbus_loop_remove_timeout (context->loop,
>+                             timeout, server_timeout_callback, context);
>+}
>+
>+dbus_bool_t
>+test_server_setup (DBusLoop      *loop,
>+                   DBusServer    *server)
>+{
>+  ServerData *sd;
>+
>+  sd = serverdata_new (loop, server);
>+  if (sd == NULL)
>+    goto nomem;
>+
>+  if (!dbus_server_set_watch_functions (server,
>+                                        add_server_watch,
>+                                        remove_server_watch,
>+                                        NULL,
>+                                        sd,
>+                                        serverdata_free))
>+    {
>+      return FALSE;
>+    }
>+
>+  if (!dbus_server_set_timeout_functions (server,
>+                                          add_server_timeout,
>+                                          remove_server_timeout,
>+                                          NULL,
>+                                          sd, serverdata_free))
>+    {
>+      return FALSE;
>+    }   
>+  return TRUE;
>+
>+ nomem:
>+  if (sd)
>+    serverdata_free (sd);
>+  
>+  test_server_shutdown (loop, server);
>+  
>+  return FALSE;
>+}
>+
>+void
>+test_server_shutdown (DBusLoop         *loop,
>+                      DBusServer       *server)
>+{
>+  if (!dbus_server_set_watch_functions (server,
>+                                        NULL, NULL, NULL,
>+                                        NULL,
>+                                        NULL))
>+    _dbus_assert_not_reached ("setting watch functions to NULL failed");
>+  
>+  if (!dbus_server_set_timeout_functions (server,
>+                                          NULL, NULL, NULL,
>+                                          NULL,
>+                                          NULL))
>+    _dbus_assert_not_reached ("setting timeout functions to NULL failed");  
>+}
>diff --git a/test/test-utils.h b/test/test-utils.h
>index afbdae3..90d8776 100644
>--- a/test/test-utils.h
>+++ b/test/test-utils.h
>@@ -18,5 +18,9 @@ void        test_connection_shutdown              (DBusLoop       *loop,
> void        test_connection_dispatch_all_messages (DBusConnection *connection);
> dbus_bool_t test_connection_dispatch_one_message  (DBusConnection *connection);
> 
>+dbus_bool_t test_server_setup                     (DBusLoop      *loop,
>+                                                   DBusServer    *server);
>+void        test_server_shutdown                  (DBusLoop      *loop,
>+                                                   DBusServer    *server);
> 
> #endif
>-- 
>1.5.4.1
>

Actions: View | Splinter Review

Attachments on bug 16166: 16827 | 16828 | 16829 | 16830

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.