From patchwork Mon Feb 28 09:10:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 84773 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 D061AB7103 for ; Mon, 28 Feb 2011 21:31:20 +1100 (EST) Received: from localhost ([127.0.0.1]:36192 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pu0Nm-0007Yt-Ec for incoming@patchwork.ozlabs.org; Mon, 28 Feb 2011 05:31:14 -0500 Received: from [140.186.70.92] (port=39148 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PtzB8-0003D5-F2 for qemu-devel@nongnu.org; Mon, 28 Feb 2011 04:19:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ptz7s-0004eG-MR for qemu-devel@nongnu.org; Mon, 28 Feb 2011 04:10:45 -0500 Received: from mail-gx0-f173.google.com ([209.85.161.173]:57989) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ptz7s-0004dE-HX for qemu-devel@nongnu.org; Mon, 28 Feb 2011 04:10:44 -0500 Received: by mail-gx0-f173.google.com with SMTP id 28so1785045gxk.4 for ; Mon, 28 Feb 2011 01:10:44 -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=NduKhJ5fGnn+vr+7V33kxt5eOS65h9laAUHL97n9eI4yNBlQv4kv+Z1tVaZWuSIQXc 0IdVTx+LF+tga6/V6Q2z9hEmOOjRoP+bikYRpHmApRNF/Ie7P46LUkow0WdtesMaBHOZ kYBD7IS4d3F4I9rtm3N43bvv5lu5oAMuZRM2U= 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=puWkEM4u3LfjA5U4ijercykzxY+xWWxLMnCwto8/tzjYfoNPkgjnVLBuTXcKddXGSa quL594e7CFs1q/AB1R/vNcV5s2T38x8hr2NJZZQccySmxAvqN83W6vRD5u808t1sc50m Dd6js8rJmwYkNGpUES1ZnyqiOIWqGThxIXEMI= Received: by 10.90.71.3 with SMTP id t3mr7067954aga.112.1298884244379; Mon, 28 Feb 2011 01:10:44 -0800 (PST) Received: from localhost.localdomain (93-34-149-100.ip50.fastwebnet.it [93.34.149.100]) by mx.google.com with ESMTPS id 1sm2037209yhl.11.2011.02.28.01.10.41 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 28 Feb 2011 01:10:43 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 28 Feb 2011 10:10:05 +0100 Message-Id: <1298884224-19734-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1298884224-19734-1-git-send-email-pbonzini@redhat.com> References: <1298884224-19734-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.161.173 Cc: blauwirbel@gmail.com, jan.kiszka@siemes.com, aurelien@aurel32.net, kvm@vger.kernel.org, mtosatti@redhat.com Subject: [Qemu-devel] [PATCH v3 uq/master 03/22] 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 */