Patchwork [3/5] char: unix: For files that are nonblocking, report -EAGAIN to calling functions

login
register
mail settings
Submitter Amit Shah
Date April 5, 2010, 12:45 p.m.
Message ID <1270471538-31275-4-git-send-email-amit.shah@redhat.com>
Download mbox | patch
Permalink /patch/49381/
State New
Headers show

Comments

Amit Shah - April 5, 2010, 12:45 p.m.
If the chardev we're writing to is nonblocking, just report -EAGAIN to
the caller so that the caller can take any further action as it may see
fit.

Modify poll call for polling for a timeout of 10ms instead of waiting
indefinitely for POLLOUT to get set.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
 qemu-char.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

Patch

diff --git a/qemu-char.c b/qemu-char.c
index 48e1e57..b565872 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -516,6 +516,15 @@  static int unix_write(int fd, const uint8_t *buf, size_t *len)
 {
     struct pollfd pollfds[1];
     ssize_t tmplen, ret;
+    int flags;
+    bool nonblock;
+
+    flags = fcntl(fd, F_GETFL);
+    if (flags == -1) {
+        flags = 0;
+    }
+
+    nonblock = flags & O_NONBLOCK;
 
     pollfds[0].fd = fd;
     pollfds[0].events = POLLOUT;
@@ -523,13 +532,16 @@  static int unix_write(int fd, const uint8_t *buf, size_t *len)
     tmplen = *len;
     *len = 0;
     while (tmplen > 0) {
-        ret = poll(pollfds, 1, -1);
+        ret = poll(pollfds, 1, 10);
         if (ret == -1) {
             if (errno == EINTR) {
                 continue;
             }
             return -1;
         }
+        if (ret == 0 && nonblock) {
+            return -EAGAIN;
+        }
         ret = write(fd, buf, tmplen);
         if (ret < 0) {
             if (errno != EINTR && errno != EAGAIN) {