From patchwork Thu Aug 15 20:34:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bligh X-Patchwork-Id: 267448 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EF55D2C020D for ; Fri, 16 Aug 2013 07:14:08 +1000 (EST) Received: from localhost ([::1]:55360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VA4Kv-0000cX-2Y for incoming@patchwork.ozlabs.org; Thu, 15 Aug 2013 16:40:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VA4G3-0002Xm-Bi for qemu-devel@nongnu.org; Thu, 15 Aug 2013 16:35:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VA4G0-0001Ej-1o for qemu-devel@nongnu.org; Thu, 15 Aug 2013 16:34:59 -0400 Received: from mail.avalus.com ([2001:41c8:10:1dd::10]:56864) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VA4Fz-0001Ea-Ry for qemu-devel@nongnu.org; Thu, 15 Aug 2013 16:34:55 -0400 Received: by mail.avalus.com (Postfix) with ESMTPSA id 18614C561B0; Thu, 15 Aug 2013 21:34:55 +0100 (BST) From: Alex Bligh To: qemu-devel@nongnu.org Date: Thu, 15 Aug 2013 21:34:13 +0100 Message-Id: <1376598879-18976-6-git-send-email-alex@alex.org.uk> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1376598879-18976-1-git-send-email-alex@alex.org.uk> References: <1376598879-18976-1-git-send-email-alex@alex.org.uk> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:41c8:10:1dd::10 Cc: Kevin Wolf , Anthony Liguori , Alex Bligh , Jan Kiszka , liu ping fan , Stefan Hajnoczi , Paolo Bonzini , MORITA Kazutaka , rth@twiddle.net Subject: [Qemu-devel] [PATCHv11 05/31] aio / timers: add ppoll support with qemu_poll_ns X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add qemu_poll_ns which works like g_poll but takes a nanosecond timeout. Signed-off-by: Alex Bligh --- configure | 19 +++++++++++++++++++ include/qemu/timer.h | 12 ++++++++++++ qemu-timer.c | 24 ++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/configure b/configure index 18fa608..5659412 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 + +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 @@ -3814,6 +3830,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 e0a51a1..fcc3ca0 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -63,6 +63,18 @@ int64_t qemu_clock_deadline_ns(QEMUClock *clock); */ int qemu_timeout_ns_to_ms(int64_t ns); +/** + * qemu_poll_ns: + * @fds: Array of file descriptors + * @nfds: number of file descriptors + * @timeout: timeout in nanoseconds + * + * Perform a poll like g_poll but with a timeout in nanoseconds. + * See g_poll documentation for further details. + * + * Returns: number of fds ready + */ +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 be29adf..4bf05d4 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -37,6 +37,10 @@ #include #endif +#ifdef CONFIG_PPOLL +#include +#endif + /***********************************************************/ /* timers */ @@ -323,6 +327,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) {