#include "gioerror.h"
#include "glibintl.h"
-#include "gioalias.h"
/**
* SECTION:goutputstream
* All of these functions have async variants too.
**/
-G_DEFINE_TYPE (GOutputStream, g_output_stream, G_TYPE_OBJECT);
+G_DEFINE_ABSTRACT_TYPE (GOutputStream, g_output_stream, G_TYPE_OBJECT);
struct _GOutputStreamPrivate {
guint closed : 1;
guint pending : 1;
+ guint closing : 1;
GAsyncReadyCallback outstanding_callback;
};
/**
* g_output_stream_write:
* @stream: a #GOutputStream.
- * @buffer: the buffer containing the data to write.
+ * @buffer: (array length=count) (element-type guint8): the buffer containing the data to write.
* @count: the number of bytes to write
* @cancellable: optional cancellable object
* @error: location to store the error occuring, or %NULL to ignore
* Tries to write @count bytes from @buffer into the stream. Will block
* during the operation.
*
- * If count is zero returns zero and does nothing. A value of @count
+ * If count is 0, returns 0 and does nothing. A value of @count
* larger than %G_MAXSSIZE will cause a %G_IO_ERROR_INVALID_ARGUMENT error.
*
* On success, the number of bytes written to the stream is returned.
* It is not an error if this is not the same as the requested size, as it
- * can happen e.g. on a partial i/o error, or if there is not enough
- * storage in the stream. All writes either block until at least one byte
- * is written, so zero is never returned (unless @count is zero).
+ * can happen e.g. on a partial I/O error, or if there is not enough
+ * storage in the stream. All writes block until at least one byte
+ * is written or an error occurs; 0 is never returned (unless
+ * @count is 0).
*
* If @cancellable is not NULL, then the operation can be cancelled by
* triggering the cancellable object from another thread. If the operation
- * was cancelled, the error G_IO_ERROR_CANCELLED will be returned. If an
+ * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. If an
* operation was partially finished when the operation was cancelled the
* partial result will be returned, without an error.
*
/**
* g_output_stream_write_all:
* @stream: a #GOutputStream.
- * @buffer: the buffer containing the data to write.
+ * @buffer: (array length=count) (element-type guint8): the buffer containing the data to write.
* @count: the number of bytes to write
* @bytes_written: location to store the number of bytes that was
* written to the stream
if (!g_output_stream_set_pending (stream, error))
return FALSE;
+ stream->priv->closing = TRUE;
+
if (cancellable)
g_cancellable_push_current (cancellable);
if (cancellable)
g_cancellable_pop_current (cancellable);
-
+
+ stream->priv->closing = FALSE;
stream->priv->closed = TRUE;
g_output_stream_clear_pending (stream);
g_object_unref (stream);
}
+typedef struct {
+ gint io_priority;
+ GCancellable *cancellable;
+ GError *flush_error;
+ gpointer user_data;
+} CloseUserData;
+
static void
async_ready_close_callback_wrapper (GObject *source_object,
GAsyncResult *res,
gpointer user_data)
{
GOutputStream *stream = G_OUTPUT_STREAM (source_object);
+ CloseUserData *data = user_data;
+ stream->priv->closing = FALSE;
stream->priv->closed = TRUE;
+
g_output_stream_clear_pending (stream);
+
if (stream->priv->outstanding_callback)
- (*stream->priv->outstanding_callback) (source_object, res, user_data);
+ {
+ if (data->flush_error != NULL)
+ {
+ GSimpleAsyncResult *err;
+
+ err = g_simple_async_result_new_take_error (source_object,
+ stream->priv->outstanding_callback,
+ data->user_data,
+ data->flush_error);
+ data->flush_error = NULL;
+
+ (*stream->priv->outstanding_callback) (source_object,
+ G_ASYNC_RESULT (err),
+ data->user_data);
+ g_object_unref (err);
+ }
+ else
+ {
+ (*stream->priv->outstanding_callback) (source_object,
+ res,
+ data->user_data);
+ }
+ }
+
g_object_unref (stream);
+
+ if (data->cancellable)
+ g_object_unref (data->cancellable);
+
+ if (data->flush_error)
+ g_error_free (data->flush_error);
+
+ g_slice_free (CloseUserData, data);
+}
+
+static void
+async_ready_close_flushed_callback_wrapper (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GOutputStream *stream = G_OUTPUT_STREAM (source_object);
+ GOutputStreamClass *class;
+ CloseUserData *data = user_data;
+ GSimpleAsyncResult *simple;
+
+ /* propagate the possible error */
+ if (G_IS_SIMPLE_ASYNC_RESULT (res))
+ {
+ simple = G_SIMPLE_ASYNC_RESULT (res);
+ g_simple_async_result_propagate_error (simple, &data->flush_error);
+ }
+
+ class = G_OUTPUT_STREAM_GET_CLASS (stream);
+
+ /* we still close, even if there was a flush error */
+ class->close_async (stream, data->io_priority, data->cancellable,
+ async_ready_close_callback_wrapper, user_data);
}
/**
* g_output_stream_write_async:
* @stream: A #GOutputStream.
- * @buffer: the buffer containing the data to write.
+ * @buffer: (array length=count) (element-type guint8): the buffer containing the data to write.
* @count: the number of bytes to write
* @io_priority: the io priority of the request.
* @cancellable: optional #GCancellable object, %NULL to ignore.
* requested size, as it can happen e.g. on a partial I/O error,
* but generally we try to write as many bytes as requested.
*
+ * You are guaranteed that this method will never fail with
+ * %G_IO_ERROR_WOULD_BLOCK - if @stream can't accept more data, the
+ * method will just wait until this changes.
+ *
* Any outstanding I/O request with higher priority (lower numerical
* value) will be executed before an outstanding request with lower
* priority. Default priority is %G_PRIORITY_DEFAULT.
GOutputStreamClass *class;
GSimpleAsyncResult *simple;
GError *error = NULL;
+ CloseUserData *data;
g_return_if_fail (G_IS_OUTPUT_STREAM (stream));
}
class = G_OUTPUT_STREAM_GET_CLASS (stream);
+ stream->priv->closing = TRUE;
stream->priv->outstanding_callback = callback;
g_object_ref (stream);
- class->close_async (stream, io_priority, cancellable,
- async_ready_close_callback_wrapper, user_data);
+
+ data = g_slice_new0 (CloseUserData);
+
+ if (cancellable != NULL)
+ data->cancellable = g_object_ref (cancellable);
+
+ data->io_priority = io_priority;
+ data->user_data = user_data;
+
+ /* Call close_async directly if there is no need to flush, or if the flush
+ can be done sync (in the output stream async close thread) */
+ if (class->flush_async == NULL ||
+ (class->flush_async == g_output_stream_real_flush_async &&
+ (class->flush == NULL || class->close_async == g_output_stream_real_close_async)))
+ {
+ class->close_async (stream, io_priority, cancellable,
+ async_ready_close_callback_wrapper, data);
+ }
+ else
+ {
+ /* First do an async flush, then do the async close in the callback
+ wrapper (see async_ready_close_flushed_callback_wrapper) */
+ class->flush_async (stream, io_priority, cancellable,
+ async_ready_close_flushed_callback_wrapper, data);
+ }
}
/**
}
/**
+ * g_output_stream_is_closing:
+ * @stream: a #GOutputStream.
+ *
+ * Checks if an output stream is being closed. This can be
+ * used inside e.g. a flush implementation to see if the
+ * flush (or other i/o operation) is called from within
+ * the closing operation.
+ *
+ * Returns: %TRUE if @stream is being closed. %FALSE otherwise.
+ *
+ * Since: 2.24
+ **/
+gboolean
+g_output_stream_is_closing (GOutputStream *stream)
+{
+ g_return_val_if_fail (G_IS_OUTPUT_STREAM (stream), TRUE);
+
+ return stream->priv->closing;
+}
+
+/**
* g_output_stream_has_pending:
* @stream: a #GOutputStream.
*
op->count_written = class->write_fn (G_OUTPUT_STREAM (object), op->buffer, op->count_requested,
cancellable, &error);
if (op->count_written == -1)
- {
- g_simple_async_result_set_from_error (res, error);
- g_error_free (error);
- }
+ g_simple_async_result_take_error (res, error);
}
static void
cancellable,
&error);
if (op->bytes_copied == -1)
- {
- g_simple_async_result_set_from_error (result, error);
- g_error_free (error);
- }
+ g_simple_async_result_take_error (result, error);
}
static void
result = class->flush (G_OUTPUT_STREAM (object), cancellable, &error);
if (!result)
- {
- g_simple_async_result_set_from_error (res, error);
- g_error_free (error);
- }
+ g_simple_async_result_take_error (res, error);
}
static void
{
GOutputStreamClass *class;
GError *error = NULL;
- gboolean result;
+ gboolean result = TRUE;
+
+ class = G_OUTPUT_STREAM_GET_CLASS (object);
+
+ /* Do a flush here if there is a flush function, and we did not have to do
+ an async flush before (see g_output_stream_close_async) */
+ if (class->flush != NULL &&
+ (class->flush_async == NULL ||
+ class->flush_async == g_output_stream_real_flush_async))
+ {
+ result = class->flush (G_OUTPUT_STREAM (object), cancellable, &error);
+ }
/* Auto handling of cancelation disabled, and ignore
cancellation, since we want to close things anyway, although
possibly in a quick-n-dirty way. At least we never want to leak
open handles */
-
- class = G_OUTPUT_STREAM_GET_CLASS (object);
+
if (class->close_fn)
{
- result = class->close_fn (G_OUTPUT_STREAM (object), cancellable, &error);
+ /* Make sure to close, even if the flush failed (see sync close) */
if (!result)
- {
- g_simple_async_result_set_from_error (res, error);
- g_error_free (error);
- }
+ class->close_fn (G_OUTPUT_STREAM (object), cancellable, NULL);
+ else
+ result = class->close_fn (G_OUTPUT_STREAM (object), cancellable, &error);
+
+ if (!result)
+ g_simple_async_result_take_error (res, error);
}
}
g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_output_stream_real_close_async);
return TRUE;
}
-
-#define __G_OUTPUT_STREAM_C__
-#include "gioaliasdef.c"
projects / platform / upstream / glib.git / blobdiff