diff options
author | Dan Winship <danw@gnome.org> | 2012-12-18 13:59:03 +0100 |
---|---|---|
committer | Tomas Bzatek <tbzatek@redhat.com> | 2012-12-18 14:21:55 +0100 |
commit | ed7fd5313ca8759e162c640b3de293489e359162 (patch) | |
tree | 0e4f2c2d4af91558e945163e5a2d37bb81096d31 /daemon | |
parent | d751f968d65fa287a8cbfa6e2a28f8dd421deb66 (diff) |
dav: kill SoupOutputStream
SoupOutputStream was never particularly useful, since we ended up not
doing chunked requests (since server support for them is mostly
nonexistent). So kill SoupOutputStream off and just use a
GMemoryOutputStream instead.
https://bugzilla.gnome.org/show_bug.cgi?id=687757
Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>
Diffstat (limited to 'daemon')
-rw-r--r-- | daemon/Makefile.am | 1 | ||||
-rw-r--r-- | daemon/gvfsbackenddav.c | 64 | ||||
-rw-r--r-- | daemon/soup-output-stream.c | 420 | ||||
-rw-r--r-- | daemon/soup-output-stream.h | 63 |
4 files changed, 28 insertions, 520 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 52684fc2..3a1f684f 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -466,7 +466,6 @@ gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS) gvfsd_dav_SOURCES = \ gvfshttpinputstream.c gvfshttpinputstream.h \ - soup-output-stream.c soup-output-stream.h \ gvfsbackendhttp.c gvfsbackendhttp.h \ gvfsbackenddav.c gvfsbackenddav.h \ daemon-main.c daemon-main.h \ diff --git a/daemon/gvfsbackenddav.c b/daemon/gvfsbackenddav.c index aa71a6d5..e46536f6 100644 --- a/daemon/gvfsbackenddav.c +++ b/daemon/gvfsbackenddav.c @@ -58,8 +58,6 @@ #include "gvfsjobenumerate.h" #include "gvfsdaemonprotocol.h" -#include "soup-output-stream.h" - #ifdef HAVE_AVAHI #include "gvfsdnssdutils.h" #include "gvfsdnssdresolver.h" @@ -2308,8 +2306,8 @@ try_create_tested_existence (SoupSession *session, SoupMessage *msg, * Doesn't work with apache > 2.2.9 * soup_message_headers_append (put_msg->request_headers, "If-None-Match", "*"); */ - stream = soup_output_stream_new (op_backend->session, put_msg, -1); - g_object_unref (put_msg); + stream = g_memory_output_stream_new (NULL, 0, g_realloc, g_free); + g_object_set_data_full (G_OBJECT (stream), "-gvfs-stream-msg", put_msg, g_object_unref); g_vfs_job_open_for_write_set_handle (G_VFS_JOB_OPEN_FOR_WRITE (job), stream); g_vfs_job_succeeded (job); @@ -2324,7 +2322,7 @@ try_create (GVfsBackend *backend, SoupMessage *msg; SoupURI *uri; - /* TODO: if SoupOutputStream supported chunked requests, we could + /* TODO: if we supported chunked requests, we could * use a PUT with "If-None-Match: *" and "Expect: 100-continue" */ uri = g_vfs_backend_dav_uri_for_path (backend, filename, FALSE); @@ -2350,8 +2348,8 @@ open_for_replace_succeeded (GVfsBackendHttp *op_backend, GVfsJob *job, if (etag) soup_message_headers_append (put_msg->request_headers, "If-Match", etag); - stream = soup_output_stream_new (op_backend->session, put_msg, -1); - g_object_unref (put_msg); + stream = g_memory_output_stream_new (NULL, 0, g_realloc, g_free); + g_object_set_data_full (G_OBJECT (stream), "-gvfs-stream-msg", put_msg, g_object_unref); g_vfs_job_open_for_write_set_handle (G_VFS_JOB_OPEN_FOR_WRITE (job), stream); g_vfs_job_succeeded (job); @@ -2482,34 +2480,17 @@ try_write (GVfsBackend *backend, /* *** close_write () *** */ static void -close_write_ready (GObject *source_object, - GAsyncResult *result, - gpointer user_data) +try_close_write_sent (SoupSession *session, + SoupMessage *msg, + gpointer user_data) { - GOutputStream *stream; - GVfsJob *job; - GError *error; - gboolean res; + GVfsJob *job; - error = NULL; job = G_VFS_JOB (user_data); - stream = G_OUTPUT_STREAM (source_object); - res = g_output_stream_close_finish (stream, - result, - &error); - if (res == FALSE) - { - g_vfs_job_failed_literal (G_VFS_JOB (job), - error->domain, - error->code, - error->message); - - g_error_free (error); - } + if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) + http_job_failed (job, msg); else g_vfs_job_succeeded (job); - - g_object_unref (stream); } static gboolean @@ -2517,15 +2498,26 @@ try_close_write (GVfsBackend *backend, GVfsJobCloseWrite *job, GVfsBackendHandle handle) { - GOutputStream *stream; + GOutputStream *stream; + SoupMessage *msg; + gsize length; + gchar *data; stream = G_OUTPUT_STREAM (handle); - g_output_stream_close_async (stream, - G_PRIORITY_DEFAULT, - G_VFS_JOB (job)->cancellable, - close_write_ready, - job); + msg = g_object_get_data (G_OBJECT (stream), "-gvfs-stream-msg"); + g_object_ref (msg); + g_object_set_data (G_OBJECT (stream), "-gvfs-stream-msg", NULL); + + g_output_stream_close (stream, NULL, NULL); + length = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (stream)); + data = g_memory_output_stream_steal_data (G_MEMORY_OUTPUT_STREAM (stream)); + g_object_unref (stream); + + soup_message_set_request (msg, NULL, + SOUP_MEMORY_TAKE, data, length); + soup_session_queue_message (G_VFS_BACKEND_HTTP (backend)->session_async, + msg, try_close_write_sent, job); return TRUE; } diff --git a/daemon/soup-output-stream.c b/daemon/soup-output-stream.c deleted file mode 100644 index 02317766..00000000 --- a/daemon/soup-output-stream.c +++ /dev/null @@ -1,420 +0,0 @@ -/* soup-output-stream.c, based on gunixoutputstream.c - * - * Copyright (C) 2006-2008 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#include <config.h> - -#include <string.h> - -#include <glib.h> -#include <gio/gio.h> - -#include <libsoup/soup.h> - -#include "soup-output-stream.h" - -G_DEFINE_TYPE (SoupOutputStream, soup_output_stream, G_TYPE_OUTPUT_STREAM) - -typedef void (*SoupOutputStreamCallback) (GOutputStream *); - -typedef struct { - SoupSession *session; - GMainContext *async_context; - SoupMessage *msg; - gboolean finished; - - goffset size, offset; - GByteArray *ba; - - GCancellable *cancellable; - GSource *cancel_watch; - SoupOutputStreamCallback finished_cb; - SoupOutputStreamCallback cancelled_cb; - - GSimpleAsyncResult *result; -} SoupOutputStreamPrivate; -#define SOUP_OUTPUT_STREAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SOUP_TYPE_OUTPUT_STREAM, SoupOutputStreamPrivate)) - -static gssize soup_output_stream_write (GOutputStream *stream, - const void *buffer, - gsize count, - GCancellable *cancellable, - GError **error); -static gboolean soup_output_stream_close (GOutputStream *stream, - GCancellable *cancellable, - GError **error); -static void soup_output_stream_write_async (GOutputStream *stream, - const void *buffer, - gsize count, - int io_priority, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer data); -static gssize soup_output_stream_write_finish (GOutputStream *stream, - GAsyncResult *result, - GError **error); -static void soup_output_stream_close_async (GOutputStream *stream, - int io_priority, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer data); -static gboolean soup_output_stream_close_finish (GOutputStream *stream, - GAsyncResult *result, - GError **error); - -static void soup_output_stream_finished (SoupMessage *msg, gpointer stream); - -static void -soup_output_stream_finalize (GObject *object) -{ - SoupOutputStreamPrivate *priv = SOUP_OUTPUT_STREAM_GET_PRIVATE (object); - - g_object_unref (priv->session); - - g_signal_handlers_disconnect_by_func (priv->msg, G_CALLBACK (soup_output_stream_finished), object); - g_object_unref (priv->msg); - - if (priv->ba) - g_byte_array_free (priv->ba, TRUE); - - if (G_OBJECT_CLASS (soup_output_stream_parent_class)->finalize) - (*G_OBJECT_CLASS (soup_output_stream_parent_class)->finalize) (object); -} - -static void -soup_output_stream_class_init (SoupOutputStreamClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GOutputStreamClass *stream_class = G_OUTPUT_STREAM_CLASS (klass); - - g_type_class_add_private (klass, sizeof (SoupOutputStreamPrivate)); - - gobject_class->finalize = soup_output_stream_finalize; - - stream_class->write_fn = soup_output_stream_write; - stream_class->close_fn = soup_output_stream_close; - stream_class->write_async = soup_output_stream_write_async; - stream_class->write_finish = soup_output_stream_write_finish; - stream_class->close_async = soup_output_stream_close_async; - stream_class->close_finish = soup_output_stream_close_finish; -} - -static void -soup_output_stream_init (SoupOutputStream *stream) -{ - SoupOutputStreamPrivate *priv = SOUP_OUTPUT_STREAM_GET_PRIVATE (stream); - - priv->ba = g_byte_array_new (); -} - - -/** - * soup_output_stream_new: - * @session: the #SoupSession to use - * @msg: the #SoupMessage whose request will be streamed - * @size: the total size of the request body, or -1 if not known - * - * Prepares to send @msg over @session, and returns a #GOutputStream - * that can be used to write the response. The server's response will - * be available in @msg after calling soup_output_stream_close() - * (which will return a %SOUP_OUTPUT_STREAM_HTTP_ERROR #GError if the - * status is not 2xx). - * - * If you know the total number of bytes that will be written, pass - * that in @size. Otherwise, pass -1. (If you pass a size, you MUST - * write that many bytes to the stream; Trying to write more than - * that, or closing the stream without having written enough, will - * result in an error. - * - * In some situations, the request will not actually be sent until you - * call g_output_stream_close(). (In fact, currently this is *always* - * true.) - * - * Internally, #SoupOutputStream is implemented using asynchronous - * I/O, so if you are using the synchronous API (eg, - * g_output_stream_write()), you should create a new #GMainContext and - * set it as the %SOUP_SESSION_ASYNC_CONTEXT property on @session. (If - * you don't, then synchronous #GOutputStream calls will cause the - * main loop to be run recursively.) The async #GOutputStream API - * works fine with %SOUP_SESSION_ASYNC_CONTEXT either set or unset. - * - * Returns: a new #GOutputStream. - **/ -GOutputStream * -soup_output_stream_new (SoupSession *session, SoupMessage *msg, goffset size) -{ - SoupOutputStream *stream; - SoupOutputStreamPrivate *priv; - - g_return_val_if_fail (SOUP_IS_MESSAGE (msg), NULL); - - stream = g_object_new (SOUP_TYPE_OUTPUT_STREAM, NULL); - priv = SOUP_OUTPUT_STREAM_GET_PRIVATE (stream); - - priv->session = g_object_ref (session); - priv->async_context = soup_session_get_async_context (session); - priv->msg = g_object_ref (msg); - priv->size = size; - - return G_OUTPUT_STREAM (stream); -} - -static gboolean -soup_output_stream_cancelled (GIOChannel *chan, GIOCondition condition, - gpointer stream) -{ - SoupOutputStreamPrivate *priv = SOUP_OUTPUT_STREAM_GET_PRIVATE (stream); - - priv->cancel_watch = NULL; - - soup_session_pause_message (priv->session, priv->msg); - if (priv->cancelled_cb) - priv->cancelled_cb (stream); - - return FALSE; -} - -static void -soup_output_stream_prepare_for_io (GOutputStream *stream, GCancellable *cancellable) -{ - SoupOutputStreamPrivate *priv = SOUP_OUTPUT_STREAM_GET_PRIVATE (stream); - int cancel_fd; - - /* Move the buffer to the SoupMessage */ - soup_message_body_append (priv->msg->request_body, SOUP_MEMORY_TAKE, - priv->ba->data, priv->ba->len); - g_byte_array_free (priv->ba, FALSE); - priv->ba = NULL; - - /* Set up cancellation */ - priv->cancellable = cancellable; - cancel_fd = g_cancellable_get_fd (cancellable); - if (cancel_fd != -1) - { - GIOChannel *chan = g_io_channel_unix_new (cancel_fd); - priv->cancel_watch = soup_add_io_watch (priv->async_context, chan, - G_IO_IN | G_IO_ERR | G_IO_HUP, - soup_output_stream_cancelled, - stream); - g_io_channel_unref (chan); - } - - /* Add an extra ref since soup_session_queue_message steals one */ - g_object_ref (priv->msg); - soup_session_queue_message (priv->session, priv->msg, NULL, NULL); -} - -static void -soup_output_stream_done_io (GOutputStream *stream) -{ - SoupOutputStreamPrivate *priv = SOUP_OUTPUT_STREAM_GET_PRIVATE (stream); - - if (priv->cancel_watch) - { - g_source_destroy (priv->cancel_watch); - priv->cancel_watch = NULL; - g_cancellable_release_fd (priv->cancellable); - } - priv->cancellable = NULL; -} - -static gboolean -set_error_if_http_failed (SoupMessage *msg, GError **error) -{ - if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) - { - g_set_error_literal (error, SOUP_HTTP_ERROR, - msg->status_code, msg->reason_phrase); - return TRUE; - } - return FALSE; -} - -static gssize -soup_output_stream_write (GOutputStream *stream, - const void *buffer, - gsize count, - GCancellable *cancellable, - GError **error) -{ - SoupOutputStreamPrivate *priv = SOUP_OUTPUT_STREAM_GET_PRIVATE (stream); - - if (priv->size > 0 && priv->offset + count > priv->size) { - g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NO_SPACE, - "Write would exceed caller-defined file size"); - return -1; - } - - g_byte_array_append (priv->ba, buffer, count); - priv->offset += count; - return count; -} - -static int -soup_output_stream_close (GOutputStream *stream, - GCancellable *cancellable, - GError **error) -{ - SoupOutputStreamPrivate *priv = SOUP_OUTPUT_STREAM_GET_PRIVATE (stream); - - if (priv->size > 0 && priv->offset != priv->size) { - g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NO_SPACE, - "File is incomplete"); - return -1; - } - - soup_output_stream_prepare_for_io (stream, cancellable); - while (!priv->finished && !g_cancellable_is_cancelled (cancellable)) - g_main_context_iteration (priv->async_context, TRUE); - soup_output_stream_done_io (stream); - - return !set_error_if_http_failed (priv->msg, error); -} - -static void -soup_output_stream_write_async (GOutputStream *stream, - const void *buffer, - gsize count, - int io_priority, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - SoupOutputStreamPrivate *priv = SOUP_OUTPUT_STREAM_GET_PRIVATE (stream); - GSimpleAsyncResult *result; - - result = g_simple_async_result_new (G_OBJECT (stream), - callback, user_data, - soup_output_stream_write_async); - - if (priv->size > 0 && priv->offset + count > priv->size) - { - GError *error; - - error = g_error_new (G_IO_ERROR, G_IO_ERROR_NO_SPACE, - "Write would exceed caller-defined file size"); - g_simple_async_result_set_from_error (result, error); - g_error_free (error); - } - else - { - g_byte_array_append (priv->ba, buffer, count); - priv->offset += count; - g_simple_async_result_set_op_res_gssize (result, count); - } - - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); -} - -static gssize -soup_output_stream_write_finish (GOutputStream *stream, - GAsyncResult *result, - GError **error) -{ - GSimpleAsyncResult *simple; - gssize nwritten; - - simple = G_SIMPLE_ASYNC_RESULT (result); - g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == soup_output_stream_write_async); - - nwritten = g_simple_async_result_get_op_res_gssize (simple); - return nwritten; -} - -static void -close_async_done (GOutputStream *stream) -{ - SoupOutputStreamPrivate *priv = SOUP_OUTPUT_STREAM_GET_PRIVATE (stream); - GSimpleAsyncResult *result; - GError *error = NULL; - - result = priv->result; - priv->result = NULL; - - if (g_cancellable_set_error_if_cancelled (priv->cancellable, &error) || - set_error_if_http_failed (priv->msg, &error)) - { - g_simple_async_result_set_from_error (result, error); - g_error_free (error); - } - else - g_simple_async_result_set_op_res_gboolean (result, TRUE); - - priv->finished_cb = NULL; - priv->cancelled_cb = NULL; - soup_output_stream_done_io (stream); - - g_simple_async_result_complete (result); - g_object_unref (result); -} - -static void -soup_output_stream_finished (SoupMessage *msg, gpointer stream) -{ - SoupOutputStreamPrivate *priv = SOUP_OUTPUT_STREAM_GET_PRIVATE (stream); - - priv->finished = TRUE; - - g_signal_handlers_disconnect_by_func (priv->msg, G_CALLBACK (soup_output_stream_finished), stream); - close_async_done (stream); -} - -static void -soup_output_stream_close_async (GOutputStream *stream, - int io_priority, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - SoupOutputStreamPrivate *priv = SOUP_OUTPUT_STREAM_GET_PRIVATE (stream); - GSimpleAsyncResult *result; - - result = g_simple_async_result_new (G_OBJECT (stream), - callback, user_data, - soup_output_stream_close_async); - - if (priv->size > 0 && priv->offset != priv->size) - { - GError *error; - - error = g_error_new (G_IO_ERROR, G_IO_ERROR_NO_SPACE, - "File is incomplete"); - g_simple_async_result_set_from_error (result, error); - g_error_free (error); - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); - return; - } - - priv->result = result; - priv->cancelled_cb = close_async_done; - g_signal_connect (priv->msg, "finished", - G_CALLBACK (soup_output_stream_finished), stream); - soup_output_stream_prepare_for_io (stream, cancellable); -} - -static gboolean -soup_output_stream_close_finish (GOutputStream *stream, - GAsyncResult *result, - GError **error) -{ - /* Failures handled in generic close_finish code */ - return TRUE; -} diff --git a/daemon/soup-output-stream.h b/daemon/soup-output-stream.h deleted file mode 100644 index 8eec7a27..00000000 --- a/daemon/soup-output-stream.h +++ /dev/null @@ -1,63 +0,0 @@ -/* Copyright (C) 2006-2008 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __SOUP_OUTPUT_STREAM_H__ -#define __SOUP_OUTPUT_STREAM_H__ - -#include <gio/gio.h> -#include <libsoup/soup-types.h> - -G_BEGIN_DECLS - -#define SOUP_TYPE_OUTPUT_STREAM (soup_output_stream_get_type ()) -#define SOUP_OUTPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SOUP_TYPE_OUTPUT_STREAM, SoupOutputStream)) -#define SOUP_OUTPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SOUP_TYPE_OUTPUT_STREAM, SoupOutputStreamClass)) -#define SOUP_IS_OUTPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SOUP_TYPE_OUTPUT_STREAM)) -#define SOUP_IS_OUTPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SOUP_TYPE_OUTPUT_STREAM)) -#define SOUP_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), SOUP_TYPE_OUTPUT_STREAM, SoupOutputStreamClass)) - -typedef struct SoupOutputStream SoupOutputStream; -typedef struct SoupOutputStreamClass SoupOutputStreamClass; - -struct SoupOutputStream -{ - GOutputStream parent; - -}; - -struct SoupOutputStreamClass -{ - GOutputStreamClass parent_class; - - /* Padding for future expansion */ - void (*_g_reserved1) (void); - void (*_g_reserved2) (void); - void (*_g_reserved3) (void); - void (*_g_reserved4) (void); - void (*_g_reserved5) (void); -}; - -GType soup_output_stream_get_type (void) G_GNUC_CONST; - -GOutputStream *soup_output_stream_new (SoupSession *session, - SoupMessage *msg, - goffset size); - -G_END_DECLS - -#endif /* __SOUP_OUTPUT_STREAM_H__ */ |