X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgunixinputstream.c;h=24700ece815bb5a84e6755adfbfc90ef5282fc7a;hb=0f9acd9d9be0d6efe3110d20eeee9a8b57b558bd;hp=a1639f6df15022d2e71e0885b614bd0c4182e196;hpb=00ee06e6a332d1415baf5533e34f05a83d64cb02;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gunixinputstream.c b/gio/gunixinputstream.c
index a1639f6..24700ec 100644
--- a/gio/gunixinputstream.c
+++ b/gio/gunixinputstream.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
*/
@@ -31,6 +29,7 @@
#include
#include
+#include
#include "gioerror.h"
#include "gsimpleasyncresult.h"
#include "gunixinputstream.h"
@@ -52,9 +51,9 @@
* asynchronous I/O. If it refers to a regular file, it will fall back
* to doing asynchronous I/O in another thread.)
*
- * Note that <gio/gunixinputstream.h> belongs
- * to the UNIX-specific GIO interfaces, thus you have to use the
- * gio-unix-2.0.pc pkg-config file when using it.
+ * Note that `` belongs to the UNIX-specific GIO
+ * interfaces, thus you have to use the `gio-unix-2.0.pc` pkg-config
+ * file when using it.
*/
enum {
@@ -63,22 +62,23 @@ enum {
PROP_CLOSE_FD
};
+struct _GUnixInputStreamPrivate {
+ int fd;
+ guint close_fd : 1;
+ guint is_pipe_or_socket : 1;
+};
+
static void g_unix_input_stream_pollable_iface_init (GPollableInputStreamInterface *iface);
static void g_unix_input_stream_file_descriptor_based_iface_init (GFileDescriptorBasedIface *iface);
G_DEFINE_TYPE_WITH_CODE (GUnixInputStream, g_unix_input_stream, G_TYPE_INPUT_STREAM,
+ G_ADD_PRIVATE (GUnixInputStream)
G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
g_unix_input_stream_pollable_iface_init)
G_IMPLEMENT_INTERFACE (G_TYPE_FILE_DESCRIPTOR_BASED,
g_unix_input_stream_file_descriptor_based_iface_init)
)
-struct _GUnixInputStreamPrivate {
- int fd;
- guint close_fd : 1;
- guint is_pipe_or_socket : 1;
-};
-
static void g_unix_input_stream_set_property (GObject *object,
guint prop_id,
const GValue *value,
@@ -119,22 +119,13 @@ static GSource *g_unix_input_stream_pollable_create_source (GPollableInputStream
GCancellable *cancellable);
static void
-g_unix_input_stream_finalize (GObject *object)
-{
- G_OBJECT_CLASS (g_unix_input_stream_parent_class)->finalize (object);
-}
-
-static void
g_unix_input_stream_class_init (GUnixInputStreamClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GInputStreamClass *stream_class = G_INPUT_STREAM_CLASS (klass);
-
- g_type_class_add_private (klass, sizeof (GUnixInputStreamPrivate));
gobject_class->get_property = g_unix_input_stream_get_property;
gobject_class->set_property = g_unix_input_stream_set_property;
- gobject_class->finalize = g_unix_input_stream_finalize;
stream_class->read_fn = g_unix_input_stream_read;
stream_class->close_fn = g_unix_input_stream_close;
@@ -246,10 +237,7 @@ g_unix_input_stream_get_property (GObject *object,
static void
g_unix_input_stream_init (GUnixInputStream *unix_stream)
{
- unix_stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (unix_stream,
- G_TYPE_UNIX_INPUT_STREAM,
- GUnixInputStreamPrivate);
-
+ unix_stream->priv = g_unix_input_stream_get_instance_private (unix_stream);
unix_stream->priv->fd = -1;
unix_stream->priv->close_fd = TRUE;
}
@@ -313,7 +301,7 @@ g_unix_input_stream_set_close_fd (GUnixInputStream *stream,
* Returns whether the file descriptor of @stream will be
* closed when the stream is closed.
*
- * Return value: %TRUE if the file descriptor is closed when done
+ * Returns: %TRUE if the file descriptor is closed when done
*
* Since: 2.20
*/
@@ -331,7 +319,7 @@ g_unix_input_stream_get_close_fd (GUnixInputStream *stream)
*
* Return the UNIX file descriptor that the stream reads from.
*
- * Return value: The file descriptor of @stream
+ * Returns: The file descriptor of @stream
*
* Since: 2.20
*/
@@ -425,20 +413,16 @@ g_unix_input_stream_close (GInputStream *stream,
if (!unix_stream->priv->close_fd)
return TRUE;
- while (1)
+ /* This might block during the close. Doesn't seem to be a way to avoid it though. */
+ res = close (unix_stream->priv->fd);
+ if (res == -1)
{
- /* This might block during the close. Doesn't seem to be a way to avoid it though. */
- res = close (unix_stream->priv->fd);
- if (res == -1)
- {
- int errsv = errno;
+ int errsv = errno;
- g_set_error (error, G_IO_ERROR,
- g_io_error_from_errno (errsv),
- _("Error closing file descriptor: %s"),
- g_strerror (errsv));
- }
- break;
+ g_set_error (error, G_IO_ERROR,
+ g_io_error_from_errno (errsv),
+ _("Error closing file descriptor: %s"),
+ g_strerror (errsv));
}
return res != -1;
@@ -466,71 +450,6 @@ g_unix_input_stream_skip_finish (GInputStream *stream,
/* TODO: Not implemented */
}
-
-typedef struct {
- GInputStream *stream;
- GAsyncReadyCallback callback;
- gpointer user_data;
-} CloseAsyncData;
-
-static void
-close_async_data_free (gpointer _data)
-{
- CloseAsyncData *data = _data;
-
- g_free (data);
-}
-
-static gboolean
-close_async_cb (CloseAsyncData *data)
-{
- GUnixInputStream *unix_stream;
- GSimpleAsyncResult *simple;
- GError *error = NULL;
- gboolean result;
- int res;
-
- unix_stream = G_UNIX_INPUT_STREAM (data->stream);
-
- if (!unix_stream->priv->close_fd)
- {
- result = TRUE;
- goto out;
- }
-
- while (1)
- {
- res = close (unix_stream->priv->fd);
- if (res == -1)
- {
- int errsv = errno;
-
- g_set_error (&error, G_IO_ERROR,
- g_io_error_from_errno (errsv),
- _("Error closing file descriptor: %s"),
- g_strerror (errsv));
- }
- break;
- }
-
- result = res != -1;
-
- out:
- simple = g_simple_async_result_new (G_OBJECT (data->stream),
- data->callback,
- data->user_data,
- g_unix_input_stream_close_async);
-
- if (!result)
- g_simple_async_result_take_error (simple, error);
-
- /* Complete immediately, not in idle, since we're already in a mainloop callout */
- g_simple_async_result_complete (simple);
- g_object_unref (simple);
-
- return FALSE;
-}
-
static void
g_unix_input_stream_close_async (GInputStream *stream,
int io_priority,
@@ -538,19 +457,17 @@ g_unix_input_stream_close_async (GInputStream *stream,
GAsyncReadyCallback callback,
gpointer user_data)
{
- GSource *idle;
- CloseAsyncData *data;
+ GTask *task;
+ GError *error = NULL;
- data = g_new0 (CloseAsyncData, 1);
+ task = g_task_new (stream, cancellable, callback, user_data);
+ g_task_set_priority (task, io_priority);
- data->stream = stream;
- data->callback = callback;
- data->user_data = user_data;
-
- idle = g_idle_source_new ();
- g_source_set_callback (idle, (GSourceFunc)close_async_cb, data, close_async_data_free);
- g_source_attach (idle, g_main_context_get_thread_default ());
- g_source_unref (idle);
+ if (g_unix_input_stream_close (stream, cancellable, &error))
+ g_task_return_boolean (task, TRUE);
+ else
+ g_task_return_error (task, error);
+ g_object_unref (task);
}
static gboolean
@@ -558,8 +475,9 @@ g_unix_input_stream_close_finish (GInputStream *stream,
GAsyncResult *result,
GError **error)
{
- /* Failures handled in generic close_finish code */
- return TRUE;
+ g_return_val_if_fail (g_task_is_valid (result, stream), FALSE);
+
+ return g_task_propagate_boolean (G_TASK (result), error);
}
static gboolean
@@ -577,6 +495,7 @@ g_unix_input_stream_pollable_is_readable (GPollableInputStream *stream)
poll_fd.fd = unix_stream->priv->fd;
poll_fd.events = G_IO_IN;
+ poll_fd.revents = 0;
do
result = g_poll (&poll_fd, 1, 0);
@@ -590,14 +509,22 @@ g_unix_input_stream_pollable_create_source (GPollableInputStream *stream,
GCancellable *cancellable)
{
GUnixInputStream *unix_stream = G_UNIX_INPUT_STREAM (stream);
- GSource *inner_source, *pollable_source;
+ GSource *inner_source, *cancellable_source, *pollable_source;
pollable_source = g_pollable_source_new (G_OBJECT (stream));
- inner_source = _g_fd_source_new (unix_stream->priv->fd, G_IO_IN, cancellable);
+ inner_source = g_unix_fd_source_new (unix_stream->priv->fd, G_IO_IN);
g_source_set_dummy_callback (inner_source);
g_source_add_child_source (pollable_source, inner_source);
g_source_unref (inner_source);
+ if (cancellable)
+ {
+ cancellable_source = g_cancellable_source_new (cancellable);
+ g_source_set_dummy_callback (cancellable_source);
+ g_source_add_child_source (pollable_source, cancellable_source);
+ g_source_unref (cancellable_source);
+ }
+
return pollable_source;
}