From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBTnc-0006Ev-Az for qemu-devel@nongnu.org; Sat, 24 Mar 2012 12:26:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SBTnV-0000Y3-BE for qemu-devel@nongnu.org; Sat, 24 Mar 2012 12:26:39 -0400 Received: from 204.146.238.178.in-addr.arpa ([178.238.146.204]:49427 helo=mail.local) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBTnV-0000Xc-2f for qemu-devel@nongnu.org; Sat, 24 Mar 2012 12:26:33 -0400 From: Lee Essen Date: Sat, 24 Mar 2012 16:26:29 +0000 Message-Id: <1332606390-3605-3-git-send-email-lee.essen@nowonline.co.uk> In-Reply-To: <1332606390-3605-1-git-send-email-lee.essen@nowonline.co.uk> References: <1332606390-3605-1-git-send-email-lee.essen@nowonline.co.uk> Subject: [Qemu-devel] [PATCH 3/4] Enable qemu-timer dynticks for Solaris List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= Dynticks was limited to linux. This patch adds Solaris support and ensures a CLOCK_HIGHRES clock is used which is the optimal setup for Solaris systems. Signed-off-by: Lee Essen --- qemu-timer.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/qemu-timer.c b/qemu-timer.c index d7f56e5..48817c9 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -77,7 +77,7 @@ struct qemu_alarm_timer { int (*start)(struct qemu_alarm_timer *t); void (*stop)(struct qemu_alarm_timer *t); void (*rearm)(struct qemu_alarm_timer *t, int64_t nearest_delta_ns); -#if defined(__linux__) +#if defined(__linux__) || defined(__sun__) int fd; timer_t timer; #elif defined(_WIN32) @@ -165,7 +165,7 @@ static int unix_start_timer(struct qemu_alarm_timer *t); static void unix_stop_timer(struct qemu_alarm_timer *t); static void unix_rearm_timer(struct qemu_alarm_timer *t, int64_t delta); -#ifdef __linux__ +#if defined(__linux__) || defined(__sun__) static int dynticks_start_timer(struct qemu_alarm_timer *t); static void dynticks_stop_timer(struct qemu_alarm_timer *t); @@ -177,7 +177,7 @@ static void dynticks_rearm_timer(struct qemu_alarm_timer *t, int64_t delta); static struct qemu_alarm_timer alarm_timers[] = { #ifndef _WIN32 -#ifdef __linux__ +#if defined(__linux__) || defined(__sun__) {"dynticks", dynticks_start_timer, dynticks_stop_timer, dynticks_rearm_timer}, #endif @@ -502,7 +502,7 @@ static void host_alarm_handler(int host_signum) } } -#if defined(__linux__) +#if defined(__linux__) || defined(__sun__) #include "compatfd.h" @@ -533,7 +533,11 @@ static int dynticks_start_timer(struct qemu_alarm_timer *t) #endif /* SIGEV_THREAD_ID */ ev.sigev_signo = SIGALRM; +#if defined(__sun__) + if (timer_create(CLOCK_HIGHRES, &ev, &host_timer)) { +#else if (timer_create(CLOCK_REALTIME, &ev, &host_timer)) { +#endif perror("timer_create"); /* disable dynticks */ @@ -585,7 +589,7 @@ static void dynticks_rearm_timer(struct qemu_alarm_timer *t, } } -#endif /* defined(__linux__) */ +#endif /* defined(__linux__) || defined(__sun__) */ #if !defined(_WIN32) -- 1.7.6.3