X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgfileoutputstream.c;h=2754405052f08708da8692f5b1211c296e41342c;hb=853692bdfd9f8a87aed70d21f643dc13b57c92d1;hp=832042e6fb308c0fc9d0218c55ea508d8682c57b;hpb=73007021796f33d7ccec4e5f2bb2b2f8660347f2;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gfileoutputstream.c b/gio/gfileoutputstream.c
index 832042e..2754405 100644
--- a/gio/gfileoutputstream.c
+++ b/gio/gfileoutputstream.c
@@ -13,9 +13,7 @@
* 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., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see .
*
* Author: Alexander Larsson
*/
@@ -25,13 +23,12 @@
#include
#include
#include
-#include "gsimpleasyncresult.h"
#include "gasyncresult.h"
+#include "gtask.h"
#include "gcancellable.h"
#include "gioerror.h"
#include "glibintl.h"
-#include "gioalias.h"
/**
* SECTION:gfileoutputstream
@@ -78,19 +75,18 @@ static GFileInfo *g_file_output_stream_real_query_info_finish (GFileOutputStream
GAsyncResult *result,
GError **error);
-G_DEFINE_TYPE_WITH_CODE (GFileOutputStream, g_file_output_stream, G_TYPE_OUTPUT_STREAM,
- G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE,
- g_file_output_stream_seekable_iface_init));
-
struct _GFileOutputStreamPrivate {
GAsyncReadyCallback outstanding_callback;
};
+G_DEFINE_TYPE_WITH_CODE (GFileOutputStream, g_file_output_stream, G_TYPE_OUTPUT_STREAM,
+ G_ADD_PRIVATE (GFileOutputStream)
+ G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE,
+ g_file_output_stream_seekable_iface_init));
+
static void
g_file_output_stream_class_init (GFileOutputStreamClass *klass)
{
- g_type_class_add_private (klass, sizeof (GFileOutputStreamPrivate));
-
klass->query_info_async = g_file_output_stream_real_query_info_async;
klass->query_info_finish = g_file_output_stream_real_query_info_finish;
}
@@ -108,9 +104,7 @@ g_file_output_stream_seekable_iface_init (GSeekableIface *iface)
static void
g_file_output_stream_init (GFileOutputStream *stream)
{
- stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream,
- G_TYPE_FILE_OUTPUT_STREAM,
- GFileOutputStreamPrivate);
+ stream->priv = g_file_output_stream_get_instance_private (stream);
}
/**
@@ -138,7 +132,7 @@ g_file_output_stream_init (GFileOutputStream *stream)
* was cancelled, the error %G_IO_ERROR_CANCELLED will be set, and %NULL will
* be returned.
*
- * Returns: a #GFileInfo for the @stream, or %NULL on error.
+ * Returns: (transfer full): a #GFileInfo for the @stream, or %NULL on error.
**/
GFileInfo *
g_file_output_stream_query_info (GFileOutputStream *stream,
@@ -194,8 +188,7 @@ async_ready_callback_wrapper (GObject *source_object,
* g_file_output_stream_query_info_async:
* @stream: a #GFileOutputStream.
* @attributes: a file attribute query string.
- * @io_priority: the I/O priority
- * of the request.
+ * @io_priority: the [I/O priority][gio-GIOScheduler] of the request
* @cancellable: optional #GCancellable object, %NULL to ignore.
* @callback: callback to call when the request is satisfied
* @user_data: the data to pass to callback function
@@ -226,11 +219,9 @@ g_file_output_stream_query_info_async (GFileOutputStream *stream,
if (!g_output_stream_set_pending (output_stream, &error))
{
- g_simple_async_report_gerror_in_idle (G_OBJECT (stream),
- callback,
- user_data,
- error);
- g_error_free (error);
+ g_task_report_error (stream, callback, user_data,
+ g_file_output_stream_query_info_async,
+ error);
return;
}
@@ -239,7 +230,7 @@ g_file_output_stream_query_info_async (GFileOutputStream *stream,
stream->priv->outstanding_callback = callback;
g_object_ref (stream);
klass->query_info_async (stream, attributes, io_priority, cancellable,
- async_ready_callback_wrapper, user_data);
+ async_ready_callback_wrapper, user_data);
}
/**
@@ -251,25 +242,22 @@ g_file_output_stream_query_info_async (GFileOutputStream *stream,
* Finalizes the asynchronous query started
* by g_file_output_stream_query_info_async().
*
- * Returns: A #GFileInfo for the finished query.
+ * Returns: (transfer full): A #GFileInfo for the finished query.
**/
GFileInfo *
g_file_output_stream_query_info_finish (GFileOutputStream *stream,
GAsyncResult *result,
GError **error)
{
- GSimpleAsyncResult *simple;
GFileOutputStreamClass *class;
g_return_val_if_fail (G_IS_FILE_OUTPUT_STREAM (stream), NULL);
g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL);
- if (G_IS_SIMPLE_ASYNC_RESULT (result))
- {
- simple = G_SIMPLE_ASYNC_RESULT (result);
- if (g_simple_async_result_propagate_error (simple, error))
- return NULL;
- }
+ if (g_async_result_legacy_propagate_error (result, error))
+ return NULL;
+ else if (g_async_result_is_tagged (result, g_file_output_stream_query_info_async))
+ return g_task_propagate_pointer (G_TASK (result), error);
class = G_FILE_OUTPUT_STREAM_GET_CLASS (stream);
return class->query_info_finish (stream, result, error);
@@ -489,48 +477,29 @@ g_file_output_stream_seekable_truncate (GSeekable *seekable,
* Default implementation of async ops *
********************************************/
-typedef struct {
- char *attributes;
- GFileInfo *info;
-} QueryInfoAsyncData;
-
static void
-query_info_data_free (QueryInfoAsyncData *data)
-{
- if (data->info)
- g_object_unref (data->info);
- g_free (data->attributes);
- g_free (data);
-}
-
-static void
-query_info_async_thread (GSimpleAsyncResult *res,
- GObject *object,
- GCancellable *cancellable)
+query_info_async_thread (GTask *task,
+ gpointer source_object,
+ gpointer task_data,
+ GCancellable *cancellable)
{
+ GFileOutputStream *stream = source_object;
+ const char *attributes = task_data;
GFileOutputStreamClass *class;
GError *error = NULL;
- QueryInfoAsyncData *data;
- GFileInfo *info;
-
- data = g_simple_async_result_get_op_res_gpointer (res);
+ GFileInfo *info = NULL;
- info = NULL;
-
- class = G_FILE_OUTPUT_STREAM_GET_CLASS (object);
+ class = G_FILE_OUTPUT_STREAM_GET_CLASS (stream);
if (class->query_info)
- info = class->query_info (G_FILE_OUTPUT_STREAM (object), data->attributes, cancellable, &error);
+ info = class->query_info (stream, attributes, cancellable, &error);
else
g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
_("Stream doesn't support query_info"));
if (info == NULL)
- {
- g_simple_async_result_set_from_error (res, error);
- g_error_free (error);
- }
+ g_task_return_error (task, error);
else
- data->info = info;
+ g_task_return_pointer (task, info, g_object_unref);
}
static void
@@ -541,35 +510,22 @@ g_file_output_stream_real_query_info_async (GFileOutputStream *stream,
GAsyncReadyCallback callback,
gpointer user_data)
{
- GSimpleAsyncResult *res;
- QueryInfoAsyncData *data;
+ GTask *task;
- data = g_new0 (QueryInfoAsyncData, 1);
- data->attributes = g_strdup (attributes);
-
- res = g_simple_async_result_new (G_OBJECT (stream), callback, user_data, g_file_output_stream_real_query_info_async);
- g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)query_info_data_free);
+ task = g_task_new (stream, cancellable, callback, user_data);
+ g_task_set_task_data (task, g_strdup (attributes), g_free);
+ g_task_set_priority (task, io_priority);
- g_simple_async_result_run_in_thread (res, query_info_async_thread, io_priority, cancellable);
- g_object_unref (res);
+ g_task_run_in_thread (task, query_info_async_thread);
+ g_object_unref (task);
}
static GFileInfo *
g_file_output_stream_real_query_info_finish (GFileOutputStream *stream,
- GAsyncResult *res,
- GError **error)
+ GAsyncResult *res,
+ GError **error)
{
- GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
- QueryInfoAsyncData *data;
+ g_return_val_if_fail (g_task_is_valid (res, stream), NULL);
- g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_output_stream_real_query_info_async);
-
- data = g_simple_async_result_get_op_res_gpointer (simple);
- if (data->info)
- return g_object_ref (data->info);
-
- return NULL;
+ return g_task_propagate_pointer (G_TASK (res), error);
}
-
-#define __G_FILE_OUTPUT_STREAM_C__
-#include "gioaliasdef.c"