From patchwork Sat Mar 12 16:43:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 86532 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9C342B6F2B for ; Sun, 13 Mar 2011 03:50:35 +1100 (EST) Received: from localhost ([127.0.0.1]:39757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PyS1Q-0006xS-7k for incoming@patchwork.ozlabs.org; Sat, 12 Mar 2011 11:50:32 -0500 Received: from [140.186.70.92] (port=39660 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PyRvZ-0004CS-1b for qemu-devel@nongnu.org; Sat, 12 Mar 2011 11:44:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PyRvX-0003vE-Lf for qemu-devel@nongnu.org; Sat, 12 Mar 2011 11:44:28 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:55933) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PyRvX-0003ur-Dg for qemu-devel@nongnu.org; Sat, 12 Mar 2011 11:44:27 -0500 Received: by wwj40 with SMTP id 40so4591947wwj.10 for ; Sat, 12 Mar 2011 08:44:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references; bh=SkeI85gXtHgcJ5EdKR2hk+Xg0eU3pUpshKtRgPZzbyo=; b=MPU7r4G6TuwETVCmweEhoBKsyQxTOBXUU/Iris8lJBBswDn90WF/PdFtjkIPuR6uZw Hq/mweb7btNCTDR8ZElYxJ1wVkYoHNo230NL2cCJfJvFQkZyaWgFYHzaDd0xwiT80eeT tvPvbpqGaEGTO5+cSSHxhIpVKAu2STFw6Ut4k= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=NpYf2WXZsDqp58Im4nr5TAkkFZiJvzUL+A6SgNEMbhHrUtoDKCp7/uNUvoKcgRaXmm 5/FK9zQUWSRRak/yVk6WDPPK+2lGrEw4BsKzsctjT8RhC3IRmLqo9wNMeXVAfKgIUSdK sDjkccaCs8DZ1qAzUMii18VL6145KNsHFze6s= Received: by 10.227.201.130 with SMTP id fa2mr3503762wbb.172.1299948266590; Sat, 12 Mar 2011 08:44:26 -0800 (PST) Received: from localhost.localdomain (93-34-197-200.ip51.fastwebnet.it [93.34.197.200]) by mx.google.com with ESMTPS id y29sm1643003wbd.16.2011.03.12.08.44.24 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 12 Mar 2011 08:44:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 12 Mar 2011 17:43:50 +0100 Message-Id: <1299948248-30206-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1299948248-30206-1-git-send-email-pbonzini@redhat.com> References: <1299948248-30206-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Cc: blauwirbel@gmail.com Subject: [Qemu-devel] [PATCH v4 upstream 03/21] use win32 timer queues X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Multimedia timers are only useful for compatibility with Windows NT 4.0 and earlier. Plus, the implementation in Wine is extremely heavyweight. Signed-off-by: Paolo Bonzini --- qemu-timer.c | 86 +++++++++++++++++++++++---------------------------------- 1 files changed, 35 insertions(+), 51 deletions(-) diff --git a/qemu-timer.c b/qemu-timer.c index 122e7ed..1939d6b 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -200,11 +200,6 @@ static void qemu_rearm_alarm_timer(struct qemu_alarm_timer *t) #ifdef _WIN32 -struct qemu_alarm_win32 { - MMRESULT timerId; - unsigned int period; -} alarm_win32_data = {0, 0}; - static int win32_start_timer(struct qemu_alarm_timer *t); static void win32_stop_timer(struct qemu_alarm_timer *t); static void win32_rearm_timer(struct qemu_alarm_timer *t); @@ -298,9 +293,9 @@ static struct qemu_alarm_timer alarm_timers[] = { {"unix", unix_start_timer, unix_stop_timer, NULL, NULL}, #else {"dynticks", win32_start_timer, - win32_stop_timer, win32_rearm_timer, &alarm_win32_data}, + win32_stop_timer, win32_rearm_timer, NULL}, {"win32", win32_start_timer, - win32_stop_timer, NULL, &alarm_win32_data}, + win32_stop_timer, NULL, NULL}, #endif {NULL, } }; @@ -636,9 +631,7 @@ void qemu_run_all_timers(void) static int64_t qemu_next_alarm_deadline(void); #ifdef _WIN32 -static void CALLBACK host_alarm_handler(UINT uTimerID, UINT uMsg, - DWORD_PTR dwUser, DWORD_PTR dw1, - DWORD_PTR dw2) +static void CALLBACK host_alarm_handler(PVOID lpParam, BOOLEAN unused) #else static void host_alarm_handler(int host_signum) #endif @@ -961,50 +954,45 @@ static void unix_stop_timer(struct qemu_alarm_timer *t) static int win32_start_timer(struct qemu_alarm_timer *t) { - TIMECAPS tc; - struct qemu_alarm_win32 *data = t->priv; - UINT flags; - - memset(&tc, 0, sizeof(tc)); - timeGetDevCaps(&tc, sizeof(tc)); - - data->period = tc.wPeriodMin; - timeBeginPeriod(data->period); - - flags = TIME_CALLBACK_FUNCTION; - if (alarm_has_dynticks(t)) - flags |= TIME_ONESHOT; - else - flags |= TIME_PERIODIC; - - data->timerId = timeSetEvent(1, // interval (ms) - data->period, // resolution - host_alarm_handler, // function - (DWORD)t, // parameter - flags); - - if (!data->timerId) { + HANDLE hTimer; + BOOLEAN success; + + /* If you call ChangeTimerQueueTimer on a one-shot timer (its period + is zero) that has already expired, the timer is not updated. Since + creating a new timer is relatively expensive, set a bogus one-hour + interval in the dynticks case. */ + success = CreateTimerQueueTimer(&hTimer, + NULL, + host_alarm_handler, + t, + 1, + alarm_has_dynticks(t) ? 3600000 : 1, + WT_EXECUTEINTIMERTHREAD); + + if (!success) { fprintf(stderr, "Failed to initialize win32 alarm timer: %ld\n", GetLastError()); - timeEndPeriod(data->period); return -1; } + t->priv = (PVOID) hTimer; return 0; } static void win32_stop_timer(struct qemu_alarm_timer *t) { - struct qemu_alarm_win32 *data = t->priv; + HANDLE hTimer = t->priv; - timeKillEvent(data->timerId); - timeEndPeriod(data->period); + if (hTimer) { + DeleteTimerQueueTimer(NULL, hTimer, NULL); + } } static void win32_rearm_timer(struct qemu_alarm_timer *t) { - struct qemu_alarm_win32 *data = t->priv; + HANDLE hTimer = t->priv; int nearest_delta_ms; + BOOLEAN success; assert(alarm_has_dynticks(t)); if (!active_timers[QEMU_CLOCK_REALTIME] && @@ -1012,25 +1000,21 @@ static void win32_rearm_timer(struct qemu_alarm_timer *t) !active_timers[QEMU_CLOCK_HOST]) return; - timeKillEvent(data->timerId); - nearest_delta_ms = (qemu_next_alarm_deadline() + 999999) / 1000000; if (nearest_delta_ms < 1) { nearest_delta_ms = 1; } - data->timerId = timeSetEvent(nearest_delta_ms, - data->period, - host_alarm_handler, - (DWORD)t, - TIME_ONESHOT | TIME_CALLBACK_FUNCTION); - - if (!data->timerId) { - fprintf(stderr, "Failed to re-arm win32 alarm timer %ld\n", - GetLastError()); + success = ChangeTimerQueueTimer(NULL, + hTimer, + nearest_delta_ms, + 3600000); - timeEndPeriod(data->period); - exit(1); + if (!success) { + fprintf(stderr, "Failed to rearm win32 alarm timer: %ld\n", + GetLastError()); + exit(-1); } + } #endif /* _WIN32 */