* GLib at ftp://ftp.gtk.org/pub/gtk/.
*/
-/* Define this to get (very) verbose logging */
+/* Define this to get (very) verbose logging of all channels */
/* #define G_IO_WIN32_DEBUG */
#include "glib.h"
*/
GIOWin32ChannelType type;
+ gboolean debug;
+
/* This is used by G_IO_WINDOWS_MESSAGES channels */
HWND hwnd; /* handle of window, or NULL */
#define LOCK(mutex) EnterCriticalSection (&mutex)
#define UNLOCK(mutex) LeaveCriticalSection (&mutex)
-/* Temporarilyu change a PRINT to PRINT_ to get just *that* message */
-#define PRINT_(x) g_print x
-
-#ifdef G_IO_WIN32_DEBUG
-#define PRINT(x) PRINT_(x)
-#else
-#define PRINT(x)
-#endif
-
struct _GIOWin32Watch {
GPollFD pollfd;
GIOChannel *channel;
};
static void
+g_io_channel_win32_init (GIOWin32Channel *channel)
+{
+#ifdef G_IO_WIN32_DEBUG
+ channel->debug = TRUE;
+#else
+ if (getenv ("G_IO_WIN32_DEBUG") != NULL)
+ channel->debug = TRUE;
+ else
+ channel->debug = FALSE;
+#endif
+ channel->buffer = NULL;
+ channel->running = FALSE;
+ channel->thread_id = 0;
+ channel->data_avail_event = NULL;
+ channel->space_avail_event = NULL;
+}
+
+static void
create_events (GIOWin32Channel *channel)
{
SECURITY_ATTRIBUTES sec_attrs;
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_channel_ref ((GIOChannel *) channel);
- PRINT (("thread %#x: starting. pid:%#x, fd:%d, data_avail:%#x, space_avail:%#x\n",
- channel->thread_id,
- (guint) GetCurrentProcessId (),
- channel->fd,
- (guint) channel->data_avail_event,
- (guint) channel->space_avail_event));
+ if (channel->debug)
+ g_print ("thread %#x: starting. pid:%#x, fd:%d, data_avail:%#x, space_avail:%#x\n",
+ channel->thread_id,
+ (guint) GetCurrentProcessId (),
+ channel->fd,
+ (guint) channel->data_avail_event,
+ (guint) channel->space_avail_event);
channel->buffer = g_malloc (BUFFER_SIZE);
channel->rdp = channel->wrp = 0;
while (channel->running)
{
LOCK (channel->mutex);
- PRINT (("thread %#x: rdp=%d, wrp=%d\n",
- channel->thread_id, channel->rdp, channel->wrp));
+ if (channel->debug)
+ g_print ("thread %#x: rdp=%d, wrp=%d\n",
+ channel->thread_id, channel->rdp, channel->wrp);
if ((channel->wrp + 1) % BUFFER_SIZE == channel->rdp)
{
/* Buffer is full */
- PRINT (("thread %#x: resetting space_available\n",
- channel->thread_id));
+ if (channel->debug)
+ g_print ("thread %#x: resetting space_available\n",
+ channel->thread_id);
ResetEvent (channel->space_avail_event);
- PRINT (("thread %#x: waiting for space\n", channel->thread_id));
+ if (channel->debug)
+ g_print ("thread %#x: waiting for space\n", channel->thread_id);
UNLOCK (channel->mutex);
WaitForSingleObject (channel->space_avail_event, INFINITE);
LOCK (channel->mutex);
- PRINT (("thread %#x: rdp=%d, wrp=%d\n",
- channel->thread_id, channel->rdp, channel->wrp));
+ if (channel->debug)
+ g_print ("thread %#x: rdp=%d, wrp=%d\n",
+ channel->thread_id, channel->rdp, channel->wrp);
}
buffer = channel->buffer + channel->wrp;
nbytes = MIN ((channel->rdp + BUFFER_SIZE - channel->wrp - 1) % BUFFER_SIZE,
BUFFER_SIZE - channel->wrp);
+ if (channel->debug)
+ g_print ("thread %#x: calling reader for %d bytes\n",
+ channel->thread_id, nbytes);
+
UNLOCK (channel->mutex);
nbytes = (*channel->reader) (channel->fd, buffer, nbytes);
break;
LOCK (channel->mutex);
- PRINT (("thread %#x: got %d bytes, rdp=%d, wrp=%d\n",
- channel->thread_id, nbytes, channel->rdp, channel->wrp));
+ if (channel->debug)
+ g_print ("thread %#x: got %d bytes, rdp=%d, wrp=%d\n",
+ channel->thread_id, nbytes, channel->rdp, channel->wrp);
channel->wrp = (channel->wrp + nbytes) % BUFFER_SIZE;
- PRINT (("thread %#x: rdp=%d, wrp=%d, setting data available\n",
- channel->thread_id, channel->rdp, channel->wrp));
+ if (channel->debug)
+ g_print ("thread %#x: rdp=%d, wrp=%d, setting data available\n",
+ channel->thread_id, channel->rdp, channel->wrp);
SetEvent (channel->data_avail_event);
UNLOCK (channel->mutex);
}
LOCK (channel->mutex);
channel->running = FALSE;
- PRINT (("thread %#x: got EOF, rdp=%d, wrp=%d, setting data available\n",
- channel->thread_id, channel->rdp, channel->wrp));
+ if (channel->debug)
+ g_print ("thread %#x: got EOF, rdp=%d, wrp=%d, setting data available\n",
+ channel->thread_id, channel->rdp, channel->wrp);
SetEvent (channel->data_avail_event);
UNLOCK (channel->mutex);
guint left = count;
LOCK (channel->mutex);
- PRINT (("reading from thread %#x %d bytes, rdp=%d, wrp=%d\n",
- channel->thread_id, count, channel->rdp, channel->wrp));
+ if (channel->debug)
+ g_print ("reading from thread %#x %d bytes, rdp=%d, wrp=%d\n",
+ channel->thread_id, count, channel->rdp, channel->wrp);
- while (left)
+ if (channel->rdp == channel->wrp)
{
- if (channel->rdp == channel->wrp)
- {
- UNLOCK (channel->mutex);
- PRINT (("waiting for data from thread %#x\n", channel->thread_id));
- WaitForSingleObject (channel->data_avail_event, INFINITE);
- LOCK (channel->mutex);
- if (channel->rdp == channel->wrp && !channel->running)
- break;
- }
-
- if (channel->rdp < channel->wrp)
- nbytes = channel->wrp - channel->rdp;
- else
- nbytes = BUFFER_SIZE - channel->rdp;
UNLOCK (channel->mutex);
- nbytes = MIN (left, nbytes);
- PRINT (("moving %d bytes from thread %#x\n",
- nbytes, channel->thread_id));
- memcpy (dest, channel->buffer + channel->rdp, nbytes);
- dest += nbytes;
- left -= nbytes;
+ if (channel->debug)
+ g_print ("waiting for data from thread %#x\n", channel->thread_id);
+ WaitForSingleObject (channel->data_avail_event, INFINITE);
LOCK (channel->mutex);
- channel->rdp = (channel->rdp + nbytes) % BUFFER_SIZE;
- PRINT (("setting space available for thread %#x\n", channel->thread_id));
- SetEvent (channel->space_avail_event);
- PRINT (("for thread %#x: rdp=%d, wrp=%d\n",
- channel->thread_id, channel->rdp, channel->wrp));
- if (channel->running && channel->rdp == channel->wrp)
+ if (channel->rdp == channel->wrp && !channel->running)
{
- PRINT (("resetting data_available of thread %#x\n",
- channel->thread_id));
- ResetEvent (channel->data_avail_event);
- };
+ UNLOCK (channel->mutex);
+ return 0;
+ }
}
+
+ if (channel->rdp < channel->wrp)
+ nbytes = channel->wrp - channel->rdp;
+ else
+ nbytes = BUFFER_SIZE - channel->rdp;
+ UNLOCK (channel->mutex);
+ nbytes = MIN (left, nbytes);
+ if (channel->debug)
+ g_print ("moving %d bytes from thread %#x\n",
+ nbytes, channel->thread_id);
+ memcpy (dest, channel->buffer + channel->rdp, nbytes);
+ dest += nbytes;
+ left -= nbytes;
+ LOCK (channel->mutex);
+ channel->rdp = (channel->rdp + nbytes) % BUFFER_SIZE;
+ if (channel->debug)
+ g_print ("setting space available for thread %#x\n", channel->thread_id);
+ SetEvent (channel->space_avail_event);
+ if (channel->debug)
+ g_print ("for thread %#x: rdp=%d, wrp=%d\n",
+ channel->thread_id, channel->rdp, channel->wrp);
+ if (channel->running && channel->rdp == channel->wrp)
+ {
+ if (channel->debug)
+ g_print ("resetting data_available of thread %#x\n",
+ channel->thread_id);
+ ResetEvent (channel->data_avail_event);
+ };
UNLOCK (channel->mutex);
+ /* We have no way to indicate any errors form the actual
+ * read() or recv() call in the reader thread. Should we have?
+ */
+ *error = G_IO_ERROR_NONE;
return count - left;
}
*/
if (!channel->running && channel->rdp == channel->wrp)
{
- PRINT (("g_io_win32_check: setting G_IO_HUP thread %#x rdp=%d wrp=%d\n", channel->thread_id, channel->rdp, channel->wrp));
+ if (channel->debug)
+ g_print ("g_io_win32_check: setting G_IO_HUP thread %#x rdp=%d wrp=%d\n",
+ channel->thread_id, channel->rdp, channel->wrp);
data->pollfd.revents |= G_IO_HUP;
return TRUE;
}
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;
result = write (win32_channel->fd, buf, count);
- PRINT (("g_io_win32_fd_write: fd:%d count:%d = %d\n", win32_channel->fd, count, result));
+ if (win32_channel->debug)
+ g_print ("g_io_win32_fd_write: fd:%d count:%d = %d\n",
+ win32_channel->fd, count, result);
if (result < 0)
{
static GIOError
g_io_win32_fd_seek (GIOChannel *channel,
- gint offset,
- GSeekType type)
+ gint offset,
+ GSeekType type)
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
int whence;
guchar *buf,
int len)
{
- int value;
-
- value = read (fd, buf, len);
-
- PRINT (("fd_reader (%d,%p,%d) = %d\n", fd, buf, len, value));
-
- return value;
+ return read (fd, buf, len);
}
static guint
gpointer user_data,
GDestroyNotify notify)
{
- GIOWin32Watch *watch = g_new (GIOWin32Watch, 1);
- GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
- DWORD nbytes;
- char dummy[1];
-
- 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;
-
- PRINT (("g_io_win32_fd_add_watch: fd:%d handle:%#x\n",
- win32_channel->fd, watch->pollfd.fd));
-
- /* Is it readable? (Would be strange to watch it otherwise, but... */
- if (ReadFile ((HANDLE) _get_osfhandle (win32_channel->fd),
- dummy, 0, &nbytes, NULL))
- 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 *channel = (GIOChannel *) win32_channel;
g_io_channel_init (channel);
+ g_io_channel_win32_init (win32_channel);
channel->funcs = &win32_channel_msg_funcs;
win32_channel->type = G_IO_WINDOWS_MESSAGES;
win32_channel->hwnd = (HWND) hwnd;
return NULL;
}
- PRINT (("g_io_channel_win32_new_fd: %d\n", fd));
-
win32_channel = g_new (GIOWin32Channel, 1);
channel = (GIOChannel *) win32_channel;
g_io_channel_init (channel);
-
+ g_io_channel_win32_init (win32_channel);
channel->funcs = &win32_channel_fd_funcs;
- win32_channel->fd = fd;
win32_channel->type = G_IO_FILE_DESC;
- win32_channel->buffer = NULL;
- win32_channel->running = FALSE;
- win32_channel->thread_id = 0;
+ win32_channel->fd = fd;
return channel;
}
GIOChannel *channel = (GIOChannel *) win32_channel;
g_io_channel_init (channel);
+ g_io_channel_win32_init (win32_channel);
channel->funcs = &win32_channel_sock_funcs;
- win32_channel->fd = socket;
win32_channel->type = G_IO_STREAM_SOCKET;
- win32_channel->buffer = NULL;
- win32_channel->running = FALSE;
- win32_channel->thread_id = 0;
+ win32_channel->fd = socket;
return channel;
}
return g_io_channel_win32_get_fd (channel);
}
-gint
-g_io_channel_win32_wait_for_condition (GIOChannel *channel,
- GIOCondition condition,
- gint timeout)
+void
+g_io_channel_win32_set_debug (GIOChannel *channel,
+ gboolean flag)
{
- GPollFD pollfd;
GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
- int result;
- pollfd.fd = (gint) win32_channel->data_avail_event;
- pollfd.events = condition;
+ win32_channel->debug = flag;
+}
- PRINT (("g_io_channel_win32_wait_for_condition: fd:%d event:%#x timeout:%d\n",
- win32_channel->fd, pollfd.fd, timeout));
+gint
+g_io_channel_win32_poll (GPollFD *fds,
+ gint n_fds,
+ gint timeout)
+{
+ int result;
- result = (*g_main_win32_get_poll_func ()) (&pollfd, 1, timeout);
+ g_return_val_if_fail (n_fds >= 0, 0);
- PRINT (("g_io_channel_win32_wait_for_condition: done:%d\n", result));
+ result = (*g_main_win32_get_poll_func ()) (fds, n_fds, timeout);
return result;
}
+void
+g_io_channel_win32_make_pollfd (GIOChannel *channel,
+ GIOCondition condition,
+ GPollFD *fd)
+{
+ GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
+
+ if (win32_channel->data_avail_event == NULL)
+ create_events (win32_channel);
+
+ fd->fd = (gint) win32_channel->data_avail_event;
+ fd->events = condition;
+
+ if (win32_channel->thread_id == 0)
+ if (win32_channel->type == G_IO_FILE_DESC)
+ create_reader_thread (win32_channel, fd_reader);
+ else if (win32_channel->type == G_IO_STREAM_SOCKET)
+ create_reader_thread (win32_channel, sock_reader);
+}
/* This variable and the functions below are present just to be
* binary compatible with old clients... But note that in GIMP, the
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 / blobdiff