+2000-08-12 Tor Lillqvist <tml@iki.fi>
+
+ * giowin32.c: Some indentation and spacing fixes. Add some more
+ logging.
+ (g_io_win32_add_watch): New function, with common code from
+ g_io_win32_fd_add_watch and g_io_win32_sock_add_watch. Don't start
+ more than one reader thread for a GIOChannel. We should obviously
+ have just one reader thread reading a file descriptor or socket.
+
2000-08-10 Havoc Pennington <hp@redhat.com>
* gthread-2.0.pc.in (Cflags): don't duplicate glib Cflags
+2000-08-12 Tor Lillqvist <tml@iki.fi>
+
+ * giowin32.c: Some indentation and spacing fixes. Add some more
+ logging.
+ (g_io_win32_add_watch): New function, with common code from
+ g_io_win32_fd_add_watch and g_io_win32_sock_add_watch. Don't start
+ more than one reader thread for a GIOChannel. We should obviously
+ have just one reader thread reading a file descriptor or socket.
+
2000-08-10 Havoc Pennington <hp@redhat.com>
* gthread-2.0.pc.in (Cflags): don't duplicate glib Cflags
+2000-08-12 Tor Lillqvist <tml@iki.fi>
+
+ * giowin32.c: Some indentation and spacing fixes. Add some more
+ logging.
+ (g_io_win32_add_watch): New function, with common code from
+ g_io_win32_fd_add_watch and g_io_win32_sock_add_watch. Don't start
+ more than one reader thread for a GIOChannel. We should obviously
+ have just one reader thread reading a file descriptor or socket.
+
2000-08-10 Havoc Pennington <hp@redhat.com>
* gthread-2.0.pc.in (Cflags): don't duplicate glib Cflags
+2000-08-12 Tor Lillqvist <tml@iki.fi>
+
+ * giowin32.c: Some indentation and spacing fixes. Add some more
+ logging.
+ (g_io_win32_add_watch): New function, with common code from
+ g_io_win32_fd_add_watch and g_io_win32_sock_add_watch. Don't start
+ more than one reader thread for a GIOChannel. We should obviously
+ have just one reader thread reading a file descriptor or socket.
+
2000-08-10 Havoc Pennington <hp@redhat.com>
* gthread-2.0.pc.in (Cflags): don't duplicate glib Cflags
+2000-08-12 Tor Lillqvist <tml@iki.fi>
+
+ * giowin32.c: Some indentation and spacing fixes. Add some more
+ logging.
+ (g_io_win32_add_watch): New function, with common code from
+ g_io_win32_fd_add_watch and g_io_win32_sock_add_watch. Don't start
+ more than one reader thread for a GIOChannel. We should obviously
+ have just one reader thread reading a file descriptor or socket.
+
2000-08-10 Havoc Pennington <hp@redhat.com>
* gthread-2.0.pc.in (Cflags): don't duplicate glib Cflags
+2000-08-12 Tor Lillqvist <tml@iki.fi>
+
+ * giowin32.c: Some indentation and spacing fixes. Add some more
+ logging.
+ (g_io_win32_add_watch): New function, with common code from
+ g_io_win32_fd_add_watch and g_io_win32_sock_add_watch. Don't start
+ more than one reader thread for a GIOChannel. We should obviously
+ have just one reader thread reading a file descriptor or socket.
+
2000-08-10 Havoc Pennington <hp@redhat.com>
* gthread-2.0.pc.in (Cflags): don't duplicate glib Cflags
+2000-08-12 Tor Lillqvist <tml@iki.fi>
+
+ * giowin32.c: Some indentation and spacing fixes. Add some more
+ logging.
+ (g_io_win32_add_watch): New function, with common code from
+ g_io_win32_fd_add_watch and g_io_win32_sock_add_watch. Don't start
+ more than one reader thread for a GIOChannel. We should obviously
+ have just one reader thread reading a file descriptor or socket.
+
2000-08-10 Havoc Pennington <hp@redhat.com>
* gthread-2.0.pc.in (Cflags): don't duplicate glib Cflags
+2000-08-12 Tor Lillqvist <tml@iki.fi>
+
+ * giowin32.c: Some indentation and spacing fixes. Add some more
+ logging.
+ (g_io_win32_add_watch): New function, with common code from
+ g_io_win32_fd_add_watch and g_io_win32_sock_add_watch. Don't start
+ more than one reader thread for a GIOChannel. We should obviously
+ have just one reader thread reading a file descriptor or socket.
+
2000-08-10 Havoc Pennington <hp@redhat.com>
* gthread-2.0.pc.in (Cflags): don't duplicate glib Cflags
channel->buffer = NULL;
channel->running = FALSE;
channel->thread_id = 0;
+ channel->data_avail_event = NULL;
+ channel->space_avail_event = NULL;
}
static void
sec_attrs.lpSecurityDescriptor = NULL;
sec_attrs.bInheritHandle = FALSE;
- channel->data_avail_event = NULL;
- channel->space_avail_event = NULL;
-
/* The data available event is manual reset, the space available event
* is automatic reset.
*/
g_io_win32_destroy
};
+static guint
+g_io_win32_add_watch (GIOChannel *channel,
+ gint priority,
+ GIOCondition condition,
+ GIOFunc func,
+ gpointer user_data,
+ GDestroyNotify notify,
+ int (*reader) (int, guchar *, int))
+{
+ GIOWin32Watch *watch = g_new (GIOWin32Watch, 1);
+ GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
+
+ watch->channel = channel;
+ g_io_channel_ref (channel);
+
+ watch->callback = func;
+ watch->condition = condition;
+
+ if (win32_channel->data_avail_event == NULL)
+ create_events (win32_channel);
+
+ watch->pollfd.fd = (gint) win32_channel->data_avail_event;
+ watch->pollfd.events = condition;
+
+ if (win32_channel->debug)
+ g_print ("g_io_win32_add_watch: fd:%d handle:%#x\n",
+ win32_channel->fd, watch->pollfd.fd);
+
+ if (win32_channel->thread_id == 0)
+ create_reader_thread (win32_channel, reader);
+
+ g_main_add_poll (&watch->pollfd, priority);
+
+ return g_source_add (priority, TRUE, &win32_watch_funcs, watch,
+ user_data, notify);
+}
+
static GIOError
g_io_win32_msg_read (GIOChannel *channel,
gchar *buf,
return G_IO_ERROR_UNKNOWN;
}
-
static void
g_io_win32_msg_close (GIOChannel *channel)
{
static GIOError
g_io_win32_fd_read (GIOChannel *channel,
- gchar *buf,
- guint count,
- guint *bytes_read)
+ gchar *buf,
+ guint count,
+ guint *bytes_read)
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
gint result;
GIOError error;
+ if (win32_channel->debug)
+ g_print ("g_io_win32_fd_read: fd:%d count:%d\n",
+ win32_channel->fd, count);
+
if (win32_channel->thread_id)
{
result = buffer_read (win32_channel, buf, count, &error);
}
static GIOError
-g_io_win32_fd_write(GIOChannel *channel,
- gchar *buf,
- guint count,
- guint *bytes_written)
+g_io_win32_fd_write (GIOChannel *channel,
+ gchar *buf,
+ guint count,
+ guint *bytes_written)
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
gint result;
static GIOError
g_io_win32_fd_seek (GIOChannel *channel,
- gint offset,
- GSeekType type)
+ gint offset,
+ GSeekType type)
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
int whence;
gpointer user_data,
GDestroyNotify notify)
{
- GIOWin32Watch *watch = g_new (GIOWin32Watch, 1);
- GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
-
- watch->channel = channel;
- g_io_channel_ref (channel);
-
- watch->callback = func;
- watch->condition = condition;
-
- create_events (win32_channel);
-
- watch->pollfd.fd = (gint) win32_channel->data_avail_event;
- watch->pollfd.events = condition;
-
- if (win32_channel->debug)
- g_print ("g_io_win32_fd_add_watch: fd:%d handle:%#x\n",
- win32_channel->fd, watch->pollfd.fd);
-
- create_reader_thread (win32_channel, fd_reader);
-
- g_main_add_poll (&watch->pollfd, priority);
-
- return g_source_add (priority, TRUE, &win32_watch_funcs,
- watch, user_data, notify);
+ return g_io_win32_add_watch (channel, priority, condition,
+ func, user_data, notify, fd_reader);
}
static GIOError
}
static GIOError
-g_io_win32_sock_write(GIOChannel *channel,
- gchar *buf,
- guint count,
- guint *bytes_written)
+g_io_win32_sock_write (GIOChannel *channel,
+ gchar *buf,
+ guint count,
+ guint *bytes_written)
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
gint result;
gpointer user_data,
GDestroyNotify notify)
{
- GIOWin32Watch *watch = g_new (GIOWin32Watch, 1);
- GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
-
- watch->channel = channel;
- g_io_channel_ref (channel);
-
- watch->callback = func;
- watch->condition = condition;
-
- create_events (win32_channel);
-
- watch->pollfd.fd = (gint) win32_channel->data_avail_event;
- watch->pollfd.events = condition;
-
- /* Sockets are always readable, aren't they? */
- create_reader_thread (win32_channel, sock_reader);
-
- g_main_add_poll (&watch->pollfd, priority);
-
- return g_source_add (priority, TRUE, &win32_watch_funcs, watch,
- user_data, notify);
+ return g_io_win32_add_watch (channel, priority, condition,
+ func, user_data, notify, sock_reader);
}
static GIOFuncs win32_channel_msg_funcs = {
GIOChannel *
g_io_channel_win32_new_pipe_with_wakeups (int fd,
- guint peer,
- int peer_fd)
+ guint peer,
+ int peer_fd)
{
return g_io_channel_win32_new_fd (fd);
}
void
g_io_channel_win32_pipe_request_wakeups (GIOChannel *channel,
- guint peer,
- int peer_fd)
+ guint peer,
+ int peer_fd)
{
/* Nothing needed now */
}
void
g_io_channel_win32_pipe_readable (gint fd,
- guint offset)
+ guint offset)
{
/* Nothing needed now */
}
channel->buffer = NULL;
channel->running = FALSE;
channel->thread_id = 0;
+ channel->data_avail_event = NULL;
+ channel->space_avail_event = NULL;
}
static void
sec_attrs.lpSecurityDescriptor = NULL;
sec_attrs.bInheritHandle = FALSE;
- channel->data_avail_event = NULL;
- channel->space_avail_event = NULL;
-
/* The data available event is manual reset, the space available event
* is automatic reset.
*/
g_io_win32_destroy
};
+static guint
+g_io_win32_add_watch (GIOChannel *channel,
+ gint priority,
+ GIOCondition condition,
+ GIOFunc func,
+ gpointer user_data,
+ GDestroyNotify notify,
+ int (*reader) (int, guchar *, int))
+{
+ GIOWin32Watch *watch = g_new (GIOWin32Watch, 1);
+ GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
+
+ watch->channel = channel;
+ g_io_channel_ref (channel);
+
+ watch->callback = func;
+ watch->condition = condition;
+
+ if (win32_channel->data_avail_event == NULL)
+ create_events (win32_channel);
+
+ watch->pollfd.fd = (gint) win32_channel->data_avail_event;
+ watch->pollfd.events = condition;
+
+ if (win32_channel->debug)
+ g_print ("g_io_win32_add_watch: fd:%d handle:%#x\n",
+ win32_channel->fd, watch->pollfd.fd);
+
+ if (win32_channel->thread_id == 0)
+ create_reader_thread (win32_channel, reader);
+
+ g_main_add_poll (&watch->pollfd, priority);
+
+ return g_source_add (priority, TRUE, &win32_watch_funcs, watch,
+ user_data, notify);
+}
+
static GIOError
g_io_win32_msg_read (GIOChannel *channel,
gchar *buf,
return G_IO_ERROR_UNKNOWN;
}
-
static void
g_io_win32_msg_close (GIOChannel *channel)
{
static GIOError
g_io_win32_fd_read (GIOChannel *channel,
- gchar *buf,
- guint count,
- guint *bytes_read)
+ gchar *buf,
+ guint count,
+ guint *bytes_read)
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
gint result;
GIOError error;
+ if (win32_channel->debug)
+ g_print ("g_io_win32_fd_read: fd:%d count:%d\n",
+ win32_channel->fd, count);
+
if (win32_channel->thread_id)
{
result = buffer_read (win32_channel, buf, count, &error);
}
static GIOError
-g_io_win32_fd_write(GIOChannel *channel,
- gchar *buf,
- guint count,
- guint *bytes_written)
+g_io_win32_fd_write (GIOChannel *channel,
+ gchar *buf,
+ guint count,
+ guint *bytes_written)
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
gint result;
static GIOError
g_io_win32_fd_seek (GIOChannel *channel,
- gint offset,
- GSeekType type)
+ gint offset,
+ GSeekType type)
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
int whence;
gpointer user_data,
GDestroyNotify notify)
{
- GIOWin32Watch *watch = g_new (GIOWin32Watch, 1);
- GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
-
- watch->channel = channel;
- g_io_channel_ref (channel);
-
- watch->callback = func;
- watch->condition = condition;
-
- create_events (win32_channel);
-
- watch->pollfd.fd = (gint) win32_channel->data_avail_event;
- watch->pollfd.events = condition;
-
- if (win32_channel->debug)
- g_print ("g_io_win32_fd_add_watch: fd:%d handle:%#x\n",
- win32_channel->fd, watch->pollfd.fd);
-
- create_reader_thread (win32_channel, fd_reader);
-
- g_main_add_poll (&watch->pollfd, priority);
-
- return g_source_add (priority, TRUE, &win32_watch_funcs,
- watch, user_data, notify);
+ return g_io_win32_add_watch (channel, priority, condition,
+ func, user_data, notify, fd_reader);
}
static GIOError
}
static GIOError
-g_io_win32_sock_write(GIOChannel *channel,
- gchar *buf,
- guint count,
- guint *bytes_written)
+g_io_win32_sock_write (GIOChannel *channel,
+ gchar *buf,
+ guint count,
+ guint *bytes_written)
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
gint result;
gpointer user_data,
GDestroyNotify notify)
{
- GIOWin32Watch *watch = g_new (GIOWin32Watch, 1);
- GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
-
- watch->channel = channel;
- g_io_channel_ref (channel);
-
- watch->callback = func;
- watch->condition = condition;
-
- create_events (win32_channel);
-
- watch->pollfd.fd = (gint) win32_channel->data_avail_event;
- watch->pollfd.events = condition;
-
- /* Sockets are always readable, aren't they? */
- create_reader_thread (win32_channel, sock_reader);
-
- g_main_add_poll (&watch->pollfd, priority);
-
- return g_source_add (priority, TRUE, &win32_watch_funcs, watch,
- user_data, notify);
+ return g_io_win32_add_watch (channel, priority, condition,
+ func, user_data, notify, sock_reader);
}
static GIOFuncs win32_channel_msg_funcs = {
GIOChannel *
g_io_channel_win32_new_pipe_with_wakeups (int fd,
- guint peer,
- int peer_fd)
+ guint peer,
+ int peer_fd)
{
return g_io_channel_win32_new_fd (fd);
}
void
g_io_channel_win32_pipe_request_wakeups (GIOChannel *channel,
- guint peer,
- int peer_fd)
+ guint peer,
+ int peer_fd)
{
/* Nothing needed now */
}
void
g_io_channel_win32_pipe_readable (gint fd,
- guint offset)
+ guint offset)
{
/* Nothing needed now */
}
projects / platform / upstream / glib.git / commitdiff