mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstpoll: Use the error fdset when using select/pselect.

Browse source 
This is needed to properly detect fds that are closed or that got
an error
This commit is contained in:
Edward Hervey 2009-10-12 10:01:01 +02:00
parent 95413683fa
commit 3254f19c6f
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst/gstpoll.c
View file

@ -275,13 +275,15 @@ choose_mode (const GstPoll * set, GstClockTime timeout)
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
static gint static gint
pollfd_to_fd_set (GstPoll * set, fd_set * readfds, fd_set * writefds) pollfd_to_fd_set (GstPoll * set, fd_set * readfds, fd_set * writefds,
fd_set * errorfds)
{ {
gint max_fd = -1; gint max_fd = -1;
guint i; guint i;
FD_ZERO (readfds); FD_ZERO (readfds);
FD_ZERO (writefds); FD_ZERO (writefds);
FD_ZERO (errorfds);
g_mutex_lock (set->lock); g_mutex_lock (set->lock);
@ -293,6 +295,8 @@ pollfd_to_fd_set (GstPoll * set, fd_set * readfds, fd_set * writefds)
FD_SET (pfd->fd, readfds); FD_SET (pfd->fd, readfds);
if (pfd->events & POLLOUT) if (pfd->events & POLLOUT)
FD_SET (pfd->fd, writefds); FD_SET (pfd->fd, writefds);
if (pfd->events)
FD_SET (pfd->fd, errorfds);
if (pfd->fd > max_fd) if (pfd->fd > max_fd)
max_fd = pfd->fd; max_fd = pfd->fd;
} }
@ -304,7 +308,8 @@ pollfd_to_fd_set (GstPoll * set, fd_set * readfds, fd_set * writefds)
} }
static void static void
fd_set_to_pollfd (GstPoll * set, fd_set * readfds, fd_set * writefds) fd_set_to_pollfd (GstPoll * set, fd_set * readfds, fd_set * writefds,
fd_set * errorfds)
{ {
guint i; guint i;
@ -318,6 +323,8 @@ fd_set_to_pollfd (GstPoll * set, fd_set * readfds, fd_set * writefds)
pfd->revents |= POLLIN; pfd->revents |= POLLIN;
if (FD_ISSET (pfd->fd, writefds)) if (FD_ISSET (pfd->fd, writefds))
pfd->revents |= POLLOUT; pfd->revents |= POLLOUT;
if (FD_ISSET (pfd->fd, errorfds))
pfd->revents |= POLLERR;
} }
} }
@ -1179,9 +1186,10 @@ gst_poll_wait (GstPoll * set, GstClockTime timeout)
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
fd_set readfds; fd_set readfds;
fd_set writefds; fd_set writefds;
fd_set errorfds;
gint max_fd; gint max_fd;
max_fd = pollfd_to_fd_set (set, &readfds, &writefds); max_fd = pollfd_to_fd_set (set, &readfds, &writefds, &errorfds);
if (mode == GST_POLL_MODE_SELECT) { if (mode == GST_POLL_MODE_SELECT) {
struct timeval tv; struct timeval tv;
@ -1194,7 +1202,7 @@ gst_poll_wait (GstPoll * set, GstClockTime timeout)
tvptr = NULL; tvptr = NULL;
} }
res = select (max_fd + 1, &readfds, &writefds, NULL, tvptr); res = select (max_fd + 1, &readfds, &writefds, &errorfds, tvptr);
} else { } else {
#ifdef HAVE_PSELECT #ifdef HAVE_PSELECT
struct timespec ts; struct timespec ts;
@ -1207,12 +1215,13 @@ gst_poll_wait (GstPoll * set, GstClockTime timeout)
tsptr = NULL; tsptr = NULL;
} }
res = pselect (max_fd + 1, &readfds, &writefds, NULL, tsptr, NULL); res =
pselect (max_fd + 1, &readfds, &writefds, &errorfds, tsptr, NULL);
#endif #endif
} }
if (res > 0) { if (res >= 0) {
fd_set_to_pollfd (set, &readfds, &writefds); fd_set_to_pollfd (set, &readfds, &writefds, &errorfds);
} }
#else /* G_OS_WIN32 */ #else /* G_OS_WIN32 */
g_assert_not_reached (); g_assert_not_reached ();