From fbde682002773e663825a6bd9c76fd4b7da2e98a Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Thu, 3 Apr 2008 14:03:17 +0000 Subject: [PATCH] plugins/elements/: Pull in patch from head to handle EAGAIN. Fixes: #524041 Original commit message from CVS: * plugins/elements/gstfdsink.c: * plugins/elements/gstfdsrc.c: Pull in patch from head to handle EAGAIN. Fixes: #524041 --- ChangeLog | 6 ++++++ common | 2 +- plugins/elements/gstfdsink.c | 2 +- plugins/elements/gstfdsrc.c | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f699eda331..9b007aab06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-03 Jan Schmidt + + * plugins/elements/gstfdsink.c: + * plugins/elements/gstfdsrc.c: + Pull in patch from head to handle EAGAIN. Fixes: #524041 + === release 0.10.18 === 2008-03-20 Jan Schmidt diff --git a/common b/common index 170f8e91ad..fda6da5f2b 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 170f8e91adc7157f6e708ffa58ca22d10e4e45da +Subproject commit fda6da5f2b9b000f7e1df8ffb44a6185ffd9799b diff --git a/plugins/elements/gstfdsink.c b/plugins/elements/gstfdsink.c index df29e7db03..44e33ddb9a 100644 --- a/plugins/elements/gstfdsink.c +++ b/plugins/elements/gstfdsink.c @@ -233,7 +233,7 @@ again: GST_DEBUG_OBJECT (fdsink, "going into select, have %d bytes to write", size); retval = gst_poll_wait (fdsink->fdset, GST_CLOCK_TIME_NONE); - } while (retval == -1 && errno == EINTR); + } while (retval == -1 && (errno == EINTR || errno == EAGAIN)); if (retval == -1) { if (errno == EBUSY) diff --git a/plugins/elements/gstfdsrc.c b/plugins/elements/gstfdsrc.c index 7e0034f06e..2d349b0f55 100644 --- a/plugins/elements/gstfdsrc.c +++ b/plugins/elements/gstfdsrc.c @@ -342,7 +342,7 @@ gst_fd_src_create (GstPushSrc * psrc, GstBuffer ** outbuf) #ifndef HAVE_WIN32 do { retval = gst_poll_wait (src->fdset, GST_CLOCK_TIME_NONE); - } while (retval == -1 && errno == EINTR); + } while (retval == -1 && (errno == EINTR || errno == EAGAIN)); /* retry if interrupted */ if (retval == -1) { if (errno == EBUSY)