All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alex Bligh <alex@alex.org.uk>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Anthony Liguori <aliguori@us.ibm.com>,
	Alex Bligh <alex@alex.org.uk>, liu ping fan <qemulist@gmail.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>,
	rth@twiddle.net
Subject: [Qemu-devel] [RFC] [PATCHv6 02/16] aio / timers: add ppoll support with qemu_poll_ns
Date: Tue,  6 Aug 2013 10:16:18 +0100	[thread overview]
Message-ID: <1375780592-22842-3-git-send-email-alex@alex.org.uk> (raw)
In-Reply-To: <1375780592-22842-1-git-send-email-alex@alex.org.uk>

Add qemu_poll_ns which works like g_poll but takes a nanosecond
timeout.

Signed-off-by: Alex Bligh <alex@alex.org.uk>
---
 configure            |   19 +++++++++++++++++++
 include/qemu/timer.h |    1 +
 qemu-timer.c         |   24 ++++++++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/configure b/configure
index f0761ea..4e54d1b 100755
--- a/configure
+++ b/configure
@@ -2818,6 +2818,22 @@ if compile_prog "" "" ; then
   dup3=yes
 fi
 
+# check for ppoll support
+ppoll=no
+cat > $TMPC << EOF
+#include <poll.h>
+
+int main(void)
+{
+    struct pollfd pfd = { .fd = 0, .events = 0, .revents = 0 };
+    ppoll(&pfd, 1, 0, 0);
+    return 0;
+}
+EOF
+if compile_prog "" "" ; then
+  ppoll=yes
+fi
+
 # check for epoll support
 epoll=no
 cat > $TMPC << EOF
@@ -3809,6 +3825,9 @@ fi
 if test "$dup3" = "yes" ; then
   echo "CONFIG_DUP3=y" >> $config_host_mak
 fi
+if test "$ppoll" = "yes" ; then
+  echo "CONFIG_PPOLL=y" >> $config_host_mak
+fi
 if test "$epoll" = "yes" ; then
   echo "CONFIG_EPOLL=y" >> $config_host_mak
 fi
diff --git a/include/qemu/timer.h b/include/qemu/timer.h
index 6171db3..f434ecb 100644
--- a/include/qemu/timer.h
+++ b/include/qemu/timer.h
@@ -44,6 +44,7 @@ int64_t qemu_clock_expired(QEMUClock *clock);
 int64_t qemu_clock_deadline(QEMUClock *clock);
 int64_t qemu_clock_deadline_ns(QEMUClock *clock);
 int qemu_timeout_ns_to_ms(int64_t ns);
+int qemu_poll_ns(GPollFD *fds, uint nfds, int64_t timeout);
 void qemu_clock_enable(QEMUClock *clock, bool enabled);
 void qemu_clock_warp(QEMUClock *clock);
 
diff --git a/qemu-timer.c b/qemu-timer.c
index 3dfbdbf..b57bd78 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -37,6 +37,10 @@
 #include <mmsystem.h>
 #endif
 
+#ifdef CONFIG_PPOLL
+#include <poll.h>
+#endif
+
 /***********************************************************/
 /* timers */
 
@@ -328,6 +332,26 @@ int qemu_timeout_ns_to_ms(int64_t ns)
 }
 
 
+/* qemu implementation of g_poll which uses a nanosecond timeout but is
+ * otherwise identical to g_poll
+ */
+int qemu_poll_ns(GPollFD *fds, uint nfds, int64_t timeout)
+{
+#ifdef CONFIG_PPOLL
+    if (timeout < 0) {
+        return ppoll((struct pollfd *)fds, nfds, NULL, NULL);
+    } else {
+        struct timespec ts;
+        ts.tv_sec = timeout / 1000000000LL;
+        ts.tv_nsec = timeout % 1000000000LL;
+        return ppoll((struct pollfd *)fds, nfds, &ts, NULL);
+    }
+#else
+    return g_poll(fds, nfds, qemu_timeout_ns_to_ms(timeout));
+#endif
+}
+
+
 QEMUTimer *qemu_new_timer(QEMUClock *clock, int scale,
                           QEMUTimerCB *cb, void *opaque)
 {
-- 
1.7.9.5

  parent reply	other threads:[~2013-08-06  9:17 UTC|newest]

Thread overview: 128+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1E8E204.8000201@redhat.com>
2013-07-20 18:06 ` [Qemu-devel] [PATCHv2] [RFC 0/7] aio / timers: Add AioContext timers and use ppoll Alex Bligh
2013-07-20 18:06   ` [Qemu-devel] [PATCHv2] [RFC 1/7] aio / timers: Remove alarm timers Alex Bligh
2013-07-25  9:10     ` Stefan Hajnoczi
2013-07-25  9:11       ` Paolo Bonzini
2013-07-25  9:38         ` Alex Bligh
2013-07-25  9:37       ` Alex Bligh
2013-07-25  9:38         ` Paolo Bonzini
2013-07-20 18:06   ` [Qemu-devel] [PATCHv2] [RFC 2/7] aio / timers: qemu-timer.c utility functions and add list of clocks Alex Bligh
2013-07-23 21:09     ` Richard Henderson
2013-07-23 21:34       ` Alex Bligh
2013-07-25  9:19     ` Stefan Hajnoczi
2013-07-25  9:46       ` Alex Bligh
2013-07-26  8:26         ` Stefan Hajnoczi
2013-07-25  9:21     ` Stefan Hajnoczi
2013-07-25  9:46       ` Alex Bligh
2013-07-20 18:06   ` [Qemu-devel] [PATCHv2] [RFC 3/7] aio / timers: add ppoll support with qemu_g_poll_ns Alex Bligh
2013-07-20 18:06   ` [Qemu-devel] [PATCHv2] [RFC 4/7] aio / timers: Make qemu_run_timers and qemu_run_all_timers return progress Alex Bligh
2013-07-20 18:06   ` [Qemu-devel] [PATCHv2] [RFC 5/7] aio / timers: Add a clock to AioContext Alex Bligh
2013-07-20 18:06   ` [Qemu-devel] [PATCHv2] [RFC 6/7] aio / timers: Switch to ppoll, run AioContext timers in aio_poll/aio_dispatch Alex Bligh
2013-07-25  9:33     ` Stefan Hajnoczi
2013-07-25 14:53       ` Alex Bligh
2013-07-26  8:34         ` Stefan Hajnoczi
2013-07-25 18:51       ` Alex Bligh
2013-07-20 18:06   ` [Qemu-devel] [PATCHv2] [RFC 7/7] aio / timers: Add test harness for AioContext timers Alex Bligh
2013-07-25  9:37   ` [Qemu-devel] [PATCHv2] [RFC 0/7] aio / timers: Add AioContext timers and use ppoll Stefan Hajnoczi
2013-07-25 22:16     ` [Qemu-devel] [RFC] [PATCHv3 00/12] " Alex Bligh
2013-07-25 22:16       ` [Qemu-devel] [RFC] [PATCHv3 01/12] aio / timers: add qemu-timer.c utility functions Alex Bligh
2013-07-25 22:16       ` [Qemu-devel] [RFC] [PATCHv3 02/12] aio / timers: add ppoll support with qemu_poll_ns Alex Bligh
2013-07-25 22:16       ` [Qemu-devel] [RFC] [PATCHv3 03/12] aio / timers: Add prctl(PR_SET_TIMERSLACK, 1, ...) to reduce timer slack Alex Bligh
2013-07-25 22:16       ` [Qemu-devel] [RFC] [PATCHv3 04/12] aio / timers: Make qemu_run_timers and qemu_run_all_timers return progress Alex Bligh
2013-07-25 22:16       ` [Qemu-devel] [RFC] [PATCHv3 05/12] aio / timers: Add a clock to AioContext Alex Bligh
2013-07-25 22:16       ` [Qemu-devel] [RFC] [PATCHv3 06/12] aio / timers: Add an AioContext pointer to QEMUClock Alex Bligh
2013-07-25 22:16       ` [Qemu-devel] [RFC] [PATCHv3 07/12] aio / timers: aio_ctx_prepare sets timeout from AioContext timers Alex Bligh
2013-07-25 22:16       ` [Qemu-devel] [RFC] [PATCHv3 08/12] aio / timers: Convert aio_poll to use AioContext timers' deadline Alex Bligh
2013-07-25 22:16       ` [Qemu-devel] [RFC] [PATCHv3 09/12] aio / timers: convert mainloop to use timeout Alex Bligh
2013-07-25 22:16       ` [Qemu-devel] [RFC] [PATCHv3 10/12] aio / timers: on timer modification, qemu_notify or aio_notify Alex Bligh
2013-07-25 22:16       ` [Qemu-devel] [RFC] [PATCHv3 11/12] aio / timers: Remove alarm timers Alex Bligh
2013-07-25 22:16       ` [Qemu-devel] [RFC] [PATCHv3 12/12] aio / timers: Add test harness for AioContext timers Alex Bligh
2013-07-25 22:22       ` [Qemu-devel] [RFC] [PATCHv3 00/12] aio / timers: Add AioContext timers and use ppoll Alex Bligh
2013-07-26 18:37         ` [Qemu-devel] [RFC] [PATCHv4 00/13] " Alex Bligh
2013-07-26 18:37           ` [Qemu-devel] [RFC] [PATCHv4 01/13] aio / timers: add qemu-timer.c utility functions Alex Bligh
2013-08-01 12:07             ` Paolo Bonzini
2013-07-26 18:37           ` [Qemu-devel] [RFC] [PATCHv4 02/13] aio / timers: add ppoll support with qemu_poll_ns Alex Bligh
2013-07-26 18:37           ` [Qemu-devel] [RFC] [PATCHv4 03/13] aio / timers: Add prctl(PR_SET_TIMERSLACK, 1, ...) to reduce timer slack Alex Bligh
2013-07-26 18:37           ` [Qemu-devel] [RFC] [PATCHv4 04/13] aio / timers: Make qemu_run_timers and qemu_run_all_timers return progress Alex Bligh
2013-07-26 18:37           ` [Qemu-devel] [RFC] [PATCHv4 05/13] aio / timers: Split QEMUClock into QEMUClock and QEMUTimerList Alex Bligh
2013-07-26 18:37           ` [Qemu-devel] [RFC] [PATCHv4 06/13] aio / timers: Add a QEMUTimerList to AioContext Alex Bligh
2013-07-26 18:37           ` [Qemu-devel] [RFC] [PATCHv4 07/13] aio / timers: Add an AioContext pointer to QEMUTimerList Alex Bligh
2013-07-26 18:37           ` [Qemu-devel] [RFC] [PATCHv4 08/13] aio / timers: aio_ctx_prepare sets timeout from AioContext timers Alex Bligh
2013-07-26 18:37           ` [Qemu-devel] [RFC] [PATCHv4 09/13] aio / timers: Convert aio_poll to use AioContext timers' deadline Alex Bligh
2013-07-26 18:37           ` [Qemu-devel] [RFC] [PATCHv4 10/13] aio / timers: Convert mainloop to use timeout Alex Bligh
2013-08-01 12:41             ` Paolo Bonzini
2013-08-01 13:43               ` Alex Bligh
2013-08-01 14:14                 ` Paolo Bonzini
2013-08-02 13:09                   ` Alex Bligh
2013-08-04 18:09                     ` [Qemu-devel] [RFC] [PATCHv5 00/16] aio / timers: Add AioContext timers and use ppoll Alex Bligh
2013-08-04 18:09                       ` [Qemu-devel] [RFC] [PATCHv5 01/16] aio / timers: add qemu-timer.c utility functions Alex Bligh
2013-08-04 18:09                       ` [Qemu-devel] [RFC] [PATCHv5 02/16] aio / timers: add ppoll support with qemu_poll_ns Alex Bligh
2013-08-04 18:09                       ` [Qemu-devel] [RFC] [PATCHv5 03/16] aio / timers: Add prctl(PR_SET_TIMERSLACK, 1, ...) to reduce timer slack Alex Bligh
2013-08-04 18:09                       ` [Qemu-devel] [RFC] [PATCHv5 04/16] aio / timers: Make qemu_run_timers and qemu_run_all_timers return progress Alex Bligh
2013-08-04 18:09                       ` [Qemu-devel] [RFC] [PATCHv5 05/16] aio / timers: Split QEMUClock into QEMUClock and QEMUTimerList Alex Bligh
2013-08-04 18:09                       ` [Qemu-devel] [RFC] [PATCHv5 06/16] aio / timers: Untangle include files Alex Bligh
2013-08-06 10:10                         ` Stefan Hajnoczi
2013-08-06 11:20                           ` Alex Bligh
2013-08-06 11:48                             ` Stefan Hajnoczi
2013-08-06 23:52                           ` Alex Bligh
2013-08-07  7:19                             ` Stefan Hajnoczi
2013-08-07 10:14                               ` Alex Bligh
2013-08-08  8:34                                 ` Stefan Hajnoczi
2013-08-04 18:09                       ` [Qemu-devel] [RFC] [PATCHv5 07/16] aio / timers: Add QEMUTimerListGroup and helper functions Alex Bligh
2013-08-04 18:09                       ` [Qemu-devel] [RFC] [PATCHv5 08/16] aio / timers: Add QEMUTimerListGroup to AioContext Alex Bligh
2013-08-04 18:09                       ` [Qemu-devel] [RFC] [PATCHv5 09/16] aio / timers: Add a notify callback to QEMUTimerList Alex Bligh
2013-08-04 18:09                       ` [Qemu-devel] [RFC] [PATCHv5 10/16] aio / timers: aio_ctx_prepare sets timeout from AioContext timers Alex Bligh
2013-08-04 18:10                       ` [Qemu-devel] [RFC] [PATCHv5 11/16] aio / timers: Convert aio_poll to use AioContext timers' deadline Alex Bligh
2013-08-04 18:10                       ` [Qemu-devel] [RFC] [PATCHv5 12/16] aio / timers: Convert mainloop to use timeout Alex Bligh
2013-08-04 18:10                       ` [Qemu-devel] [RFC] [PATCHv5 13/16] aio / timers: On timer modification, qemu_notify or aio_notify Alex Bligh
2013-08-04 18:10                       ` [Qemu-devel] [RFC] [PATCHv5 14/16] aio / timers: Use all timerlists in icount warp calculations Alex Bligh
2013-08-04 18:10                       ` [Qemu-devel] [RFC] [PATCHv5 15/16] aio / timers: Remove alarm timers Alex Bligh
2013-08-04 18:10                       ` [Qemu-devel] [RFC] [PATCHv5 16/16] aio / timers: Add test harness for AioContext timers Alex Bligh
2013-08-06  9:16                       ` [Qemu-devel] [RFC] [PATCHv6 00/16] aio / timers: Add AioContext timers and use ppoll Alex Bligh
2013-08-06  9:16                         ` [Qemu-devel] [RFC] [PATCHv6 01/16] aio / timers: add qemu-timer.c utility functions Alex Bligh
2013-08-06 12:02                           ` Stefan Hajnoczi
2013-08-06 12:30                             ` Alex Bligh
2013-08-06 13:59                               ` Stefan Hajnoczi
2013-08-06 14:18                                 ` Alex Bligh
2013-08-07  7:21                                   ` Stefan Hajnoczi
2013-08-07 10:14                                     ` Alex Bligh
2013-08-06  9:16                         ` Alex Bligh [this message]
2013-08-06  9:16                         ` [Qemu-devel] [RFC] [PATCHv6 03/16] aio / timers: Add prctl(PR_SET_TIMERSLACK, 1, ...) to reduce timer slack Alex Bligh
2013-08-06  9:16                         ` [Qemu-devel] [RFC] [PATCHv6 04/16] aio / timers: Make qemu_run_timers and qemu_run_all_timers return progress Alex Bligh
2013-08-06  9:16                         ` [Qemu-devel] [RFC] [PATCHv6 05/16] aio / timers: Split QEMUClock into QEMUClock and QEMUTimerList Alex Bligh
2013-08-06 12:26                           ` Stefan Hajnoczi
2013-08-06 12:49                             ` Alex Bligh
2013-08-06 14:29                               ` Stefan Hajnoczi
2013-08-06 14:52                                 ` Alex Bligh
2013-08-07  7:27                                   ` Stefan Hajnoczi
2013-08-07 10:16                                     ` Alex Bligh
2013-08-06 23:54                                 ` Alex Bligh
2013-08-06 13:16                             ` Alex Bligh
2013-08-06 14:31                               ` Stefan Hajnoczi
2013-08-06  9:16                         ` [Qemu-devel] [RFC] [PATCHv6 06/16] aio / timers: Untangle include files Alex Bligh
2013-08-06  9:16                         ` [Qemu-devel] [RFC] [PATCHv6 07/16] aio / timers: Add QEMUTimerListGroup and helper functions Alex Bligh
2013-08-06  9:16                         ` [Qemu-devel] [RFC] [PATCHv6 08/16] aio / timers: Add QEMUTimerListGroup to AioContext Alex Bligh
2013-08-06 12:30                           ` Stefan Hajnoczi
2013-08-06 12:50                             ` Alex Bligh
2013-08-06 14:45                               ` Stefan Hajnoczi
2013-08-06 14:58                                 ` Alex Bligh
2013-08-07  7:28                                   ` Stefan Hajnoczi
2013-08-06  9:16                         ` [Qemu-devel] [RFC] [PATCHv6 09/16] aio / timers: Add a notify callback to QEMUTimerList Alex Bligh
2013-08-06 12:34                           ` Stefan Hajnoczi
2013-08-06 12:50                             ` Alex Bligh
2013-08-06  9:16                         ` [Qemu-devel] [RFC] [PATCHv6 10/16] aio / timers: aio_ctx_prepare sets timeout from AioContext timers Alex Bligh
2013-08-06 12:40                           ` Stefan Hajnoczi
2013-08-06 12:54                             ` Alex Bligh
2013-08-06  9:16                         ` [Qemu-devel] [RFC] [PATCHv6 11/16] aio / timers: Convert aio_poll to use AioContext timers' deadline Alex Bligh
2013-08-06  9:16                         ` [Qemu-devel] [RFC] [PATCHv6 12/16] aio / timers: Convert mainloop to use timeout Alex Bligh
2013-08-06  9:16                         ` [Qemu-devel] [RFC] [PATCHv6 13/16] aio / timers: On timer modification, qemu_notify or aio_notify Alex Bligh
2013-08-06  9:16                         ` [Qemu-devel] [RFC] [PATCHv6 14/16] aio / timers: Use all timerlists in icount warp calculations Alex Bligh
2013-08-06  9:16                         ` [Qemu-devel] [RFC] [PATCHv6 15/16] aio / timers: Remove alarm timers Alex Bligh
2013-08-06  9:16                         ` [Qemu-devel] [RFC] [PATCHv6 16/16] aio / timers: Add test harness for AioContext timers Alex Bligh
2013-08-06  9:29                         ` [Qemu-devel] [RFC] [PATCHv6 00/16] aio / timers: Add AioContext timers and use ppoll Alex Bligh
2013-08-06 11:53                         ` Stefan Hajnoczi
2013-08-06 15:38                         ` Stefan Hajnoczi
2013-08-07 15:43                           ` Paolo Bonzini
2013-08-07 17:20                             ` Alex Bligh
2013-07-26 18:37           ` [Qemu-devel] [RFC] [PATCHv4 11/13] aio / timers: on timer modification, qemu_notify or aio_notify Alex Bligh
2013-07-26 18:37           ` [Qemu-devel] [RFC] [PATCHv4 12/13] aio / timers: Remove alarm timers Alex Bligh
2013-07-26 18:37           ` [Qemu-devel] [RFC] [PATCHv4 13/13] aio / timers: Add test harness for AioContext timers Alex Bligh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1375780592-22842-3-git-send-email-alex@alex.org.uk \
    --to=alex@alex.org.uk \
    --cc=aliguori@us.ibm.com \
    --cc=kwolf@redhat.com \
    --cc=morita.kazutaka@lab.ntt.co.jp \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemulist@gmail.com \
    --cc=rth@twiddle.net \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.