Attachment 41319 Details for Bug 31447 – wocky-test-stream: implement GPollableInput/OutputStream

[patch] wocky-test-stream: implement GPollableInput/OutputStream

0004-wocky-test-stream-implement-GPollableInput-OutputStr.patch (text/plain), 5.26 KB, created by Dan Winship on 2010-12-20 14:56:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Winship

Created: 2010-12-20 14:56:26 UTC

Size: 5.26 KB

patch

obsolete

>From 69e1f03562d426715730128daf3df7d0d2491341 Mon Sep 17 00:00:00 2001
>From: Dan Winship <danw@gnome.org>
>Date: Sun, 24 Oct 2010 15:39:13 -0400
>Subject: [PATCH 4/6] wocky-test-stream: implement GPollableInput/OutputStream
>
>GTlsConnection can only wrap pollable input/output streams, so
>implement that here to make some of the test cases work.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=31447
>---
> tests/wocky-test-stream.c |  118 +++++++++++++++++++++++++++++++++++++++++++--
> 1 files changed, 113 insertions(+), 5 deletions(-)
>
>diff --git a/tests/wocky-test-stream.c b/tests/wocky-test-stream.c
>index 1f955a1..d72f313 100644
>--- a/tests/wocky-test-stream.c
>+++ b/tests/wocky-test-stream.c
>@@ -80,12 +80,14 @@ typedef struct {
>   GOutputStreamClass parent_class;
> } WockyTestInputStreamClass;
> 
>+static void wocky_test_input_stream_pollable_interface_init (GPollableInputStreamInterface *iface);
>+static void wocky_test_output_stream_pollable_interface_init (GPollableOutputStreamInterface *iface);
> 
>-G_DEFINE_TYPE (WockyTestIOStream, wocky_test_io_stream, G_TYPE_IO_STREAM);
>-G_DEFINE_TYPE (WockyTestInputStream, wocky_test_input_stream,
>-  G_TYPE_INPUT_STREAM);
>-G_DEFINE_TYPE (WockyTestOutputStream, wocky_test_output_stream,
>-  G_TYPE_OUTPUT_STREAM);
>+G_DEFINE_TYPE (WockyTestIOStream, wocky_test_io_stream, G_TYPE_IO_STREAM)
>+G_DEFINE_TYPE_WITH_CODE (WockyTestInputStream, wocky_test_input_stream, G_TYPE_INPUT_STREAM,
>+                         G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM, wocky_test_input_stream_pollable_interface_init));
>+G_DEFINE_TYPE_WITH_CODE (WockyTestOutputStream, wocky_test_output_stream, G_TYPE_OUTPUT_STREAM,
>+                         G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_OUTPUT_STREAM, wocky_test_output_stream_pollable_interface_init));
> 
> #define WOCKY_TYPE_TEST_IO_STREAM (wocky_test_io_stream_get_type ())
> #define WOCKY_TYPE_TEST_INPUT_STREAM (wocky_test_input_stream_get_type ())
>@@ -458,6 +460,100 @@ wocky_test_input_stream_class_init (
>   stream_class->read_finish = wocky_test_input_stream_read_finish;
> }
> 
>+static gboolean
>+wocky_test_input_stream_is_readable (GPollableInputStream *pollable)
>+{
>+  WockyTestInputStream *self = WOCKY_TEST_INPUT_STREAM (pollable);
>+
>+  if (self->read_error)
>+    return TRUE;
>+
>+  if (self->out_array == NULL && g_async_queue_length (self->queue) == 0)
>+    return FALSE;
>+
>+  if (self->corked)
>+    return FALSE;
>+
>+  return TRUE;
>+}
>+
>+typedef struct {
>+  GSource source;
>+
>+  WockyTestInputStream *self;
>+} WockyTestInputStreamSource;
>+
>+static gboolean
>+wocky_test_input_stream_source_prepare (GSource *source,
>+                                        gint    *timeout)
>+{
>+  WockyTestInputStreamSource *wsource = (WockyTestInputStreamSource *) source;
>+
>+  *timeout = -1;
>+  return g_pollable_input_stream_is_readable (G_POLLABLE_INPUT_STREAM (wsource->self));
>+}
>+
>+static gboolean
>+wocky_test_input_stream_source_check (GSource *source)
>+{
>+  WockyTestInputStreamSource *wsource = (WockyTestInputStreamSource *) source;
>+
>+  return g_pollable_input_stream_is_readable (G_POLLABLE_INPUT_STREAM (wsource->self));
>+}
>+
>+static gboolean
>+wocky_test_input_stream_source_dispatch (GSource     *source,
>+                                         GSourceFunc  callback,
>+                                         gpointer     user_data)
>+{
>+  /* We don't do anything here; the "parent" source will handle it */
>+
>+  return TRUE;
>+}
>+
>+static void
>+wocky_test_input_stream_source_finalize (GSource *source)
>+{
>+  WockyTestInputStreamSource *wsource = (WockyTestInputStreamSource *) source;
>+
>+  g_object_unref (wsource->self);
>+}
>+
>+static GSourceFuncs wocky_test_input_stream_source_funcs =
>+{
>+  wocky_test_input_stream_source_prepare,
>+  wocky_test_input_stream_source_check,
>+  wocky_test_input_stream_source_dispatch,
>+  wocky_test_input_stream_source_finalize
>+};
>+
>+static GSource *
>+wocky_test_input_stream_create_source (GPollableInputStream *pollable,
>+                                       GCancellable *cancellable)
>+{
>+  WockyTestInputStream *self = WOCKY_TEST_INPUT_STREAM (pollable);
>+  WockyTestInputStreamSource *wsource;
>+  GSource *wocky_source, *pollable_source;
>+
>+  wocky_source = g_source_new (&wocky_test_input_stream_source_funcs,
>+                               sizeof (WockyTestInputStreamSource));
>+  wsource = (WockyTestInputStreamSource *) wocky_source;
>+  wsource->self = g_object_ref (self);
>+
>+  pollable_source = g_pollable_source_new (G_OBJECT (pollable));
>+  g_source_add_child_source (pollable_source, wocky_source);
>+  g_source_unref (wocky_source);
>+
>+  return pollable_source;
>+}
>+
>+static void
>+wocky_test_input_stream_pollable_interface_init (GPollableInputStreamInterface *iface)
>+{
>+  iface->is_readable = wocky_test_input_stream_is_readable;
>+  iface->create_source = wocky_test_input_stream_create_source;
>+}
>+
> /* Output stream */
> enum
> {
>@@ -621,6 +717,18 @@ wocky_test_output_stream_set_write_error (GOutputStream *stream)
>        "write error");
> }
> 
>+static gboolean
>+wocky_test_output_stream_is_writable (GPollableOutputStream *pollable)
>+{
>+  return TRUE;
>+}
>+
>+static void
>+wocky_test_output_stream_pollable_interface_init (GPollableOutputStreamInterface *iface)
>+{
>+  iface->is_writable = wocky_test_output_stream_is_writable;
>+}
>+
> void
> wocky_test_stream_set_mode (GInputStream *stream,
>   WockyTestSTreamReadMode mode)
>-- 
>1.7.3.3
>

Actions: View | Splinter Review

Attachments on bug 31447: 40090 | 40091 | 40092 | 40093 | 40094 | 40095 | 41319 | 41320

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.