nyje
/
medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not watch for G_IO_HUP, it catches POLLHUP from the other end

master
Yevgen Muntyan 2006-10-22 15:31:12 -05:00
parent c9e0e5d7a8
commit 89796ef834
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
moo/mooapp/mooappinput.c
View File

@ -265,7 +265,7 @@ _moo_app_input_start (MooAppInput *ch)
ch->io = g_io_channel_win32_new_fd (listener_pipe[0]); ch->io = g_io_channel_win32_new_fd (listener_pipe[0]);
g_io_channel_set_encoding (ch->io, NULL, NULL); g_io_channel_set_encoding (ch->io, NULL, NULL);
g_io_channel_set_buffered (ch->io, FALSE); g_io_channel_set_buffered (ch->io, FALSE);
ch->io_watch = g_io_add_watch (ch->io, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP, ch->io_watch = g_io_add_watch (ch->io, G_IO_IN | G_IO_PRI,
(GIOFunc) read_input, ch); (GIOFunc) read_input, ch);
ch->ready = TRUE; ch->ready = TRUE;
@ -303,12 +303,7 @@ read_input (GIOChannel *source,
guint bytes_read; guint bytes_read;
if (condition & (G_IO_ERR | G_IO_HUP)) if (condition & (G_IO_ERR | G_IO_HUP))
{ error_occured = TRUE;
if (errno != EAGAIN)
error_occured = TRUE;
else
again = FALSE;
}
g_io_channel_read_chars (source, &c, 1, &bytes_read, &err); g_io_channel_read_chars (source, &c, 1, &bytes_read, &err);
@ -523,8 +518,7 @@ _moo_app_input_start (MooAppInput *ch)
return FALSE; return FALSE;
} }
/* XXX posix man page says results of this are undefined */ ch->pipe = open (ch->pipe_name, O_RDONLY | O_NONBLOCK);
ch->pipe = open (ch->pipe_name, O_RDWR | O_NONBLOCK);
if (ch->pipe == -1) if (ch->pipe == -1)
{ {
int err = errno; int err = errno;
@ -538,7 +532,7 @@ _moo_app_input_start (MooAppInput *ch)
ch->io = g_io_channel_unix_new (ch->pipe); ch->io = g_io_channel_unix_new (ch->pipe);
g_io_channel_set_encoding (ch->io, NULL, NULL); g_io_channel_set_encoding (ch->io, NULL, NULL);
ch->io_watch = g_io_add_watch (ch->io, ch->io_watch = g_io_add_watch (ch->io,
G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP, G_IO_IN | G_IO_PRI,
(GIOFunc) read_input, (GIOFunc) read_input,
ch); ch);
@ -675,13 +669,9 @@ read_input (GIOChannel *source,
g_return_val_if_fail (source == self->io, FALSE); g_return_val_if_fail (source == self->io, FALSE);
/* XXX */
if (condition & (G_IO_ERR | G_IO_HUP)) if (condition & (G_IO_ERR | G_IO_HUP))
{ error_occured = TRUE;
if (errno != EINTR && errno != EAGAIN)
error_occured = TRUE;
else if (!(condition & (G_IO_IN | G_IO_PRI)))
again = FALSE;
}
while (again && !error_occured && !err) while (again && !error_occured && !err)
{ {
@ -749,13 +739,10 @@ read_input (GIOChannel *source,
if (error_occured || err) if (error_occured || err)
{ {
g_critical ("%s: error", G_STRLOC); g_critical ("%s: %s", G_STRLOC, err ? err->message : "error");
if (err) if (err)
{
g_critical ("%s: %s", G_STRLOC, err->message);
g_error_free (err); g_error_free (err);
}
_moo_app_input_shutdown (self); _moo_app_input_shutdown (self);
return FALSE; return FALSE;