[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC] [PATCHv7 22/22] aio / timers: Remove legacy qemu_cloc
From: |
Alex Bligh |
Subject: |
[Qemu-devel] [RFC] [PATCHv7 22/22] aio / timers: Remove legacy qemu_clock_deadline & qemu_timerlist_deadline |
Date: |
Wed, 7 Aug 2013 00:49:16 +0100 |
Remove qemu_clock_deadline and qemu_timerlist_deadline now we are using
the ns functions throughout.
Signed-off-by: Alex Bligh <address@hidden>
---
include/qemu/timer.h | 16 ----------------
qemu-timer.c | 20 --------------------
2 files changed, 36 deletions(-)
diff --git a/include/qemu/timer.h b/include/qemu/timer.h
index 21c1b04..9989d0e 100644
--- a/include/qemu/timer.h
+++ b/include/qemu/timer.h
@@ -144,7 +144,6 @@ bool qemu_clock_has_timers(QEMUClock *clock);
* an expired timer
*/
bool qemu_clock_expired(QEMUClock *clock);
-int64_t qemu_clock_deadline(QEMUClock *clock);
/**
* qemu_clock_deadline_ns:
@@ -247,21 +246,6 @@ bool timerlist_has_timers(QEMUTimerList *timer_list);
bool timerlist_expired(QEMUTimerList *timer_list);
/**
- * timerlist_deadline:
- * @timer_list: the timer list to operate on
- *
- * Determine the deadline for a timer_list. This is
- * a legacy function which returns INT32_MAX if the
- * timer list has no timers or if the earliest timer
- * expires later than INT32_MAX nanoseconds away.
- *
- * Returns: the number of nanoseconds until the earliest
- * timer expires or INT32_MAX in the situations listed
- * above
- */
-int64_t timerlist_deadline(QEMUTimerList *timer_list);
-
-/**
* timerlist_deadline_ns:
* @timer_list: the timer list to operate on
*
diff --git a/qemu-timer.c b/qemu-timer.c
index a6b274c..491b6d6 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -185,26 +185,6 @@ bool qemu_clock_expired(QEMUClock *clock)
return timerlist_expired(clock->default_timerlist);
}
-int64_t timerlist_deadline(QEMUTimerList *timer_list)
-{
- /* To avoid problems with overflow limit this to 2^32. */
- int64_t delta = INT32_MAX;
-
- if (timer_list->clock->enabled && timer_list->active_timers) {
- delta = timer_list->active_timers->expire_time -
- qemu_get_clock_ns(timer_list->clock);
- }
- if (delta < 0) {
- delta = 0;
- }
- return delta;
-}
-
-int64_t qemu_clock_deadline(QEMUClock *clock)
-{
- return timerlist_deadline(clock->default_timerlist);
-}
-
/*
* As above, but return -1 for no deadline, and do not cap to 2^32
* as we know the result is always positive.
--
1.7.9.5
- [Qemu-devel] [RFC] [PATCHv7 11/22] aio / timers: Add a notify callback to QEMUTimerList, (continued)
- [Qemu-devel] [RFC] [PATCHv7 11/22] aio / timers: Add a notify callback to QEMUTimerList, Alex Bligh, 2013/08/06
- [Qemu-devel] [RFC] [PATCHv7 07/22] aio / timers: Split QEMUClock into QEMUClock and QEMUTimerList, Alex Bligh, 2013/08/06
- [Qemu-devel] [RFC] [PATCHv7 13/22] aio / timers: Add aio_timer_new wrapper, Alex Bligh, 2013/08/06
- [Qemu-devel] [RFC] [PATCHv7 14/22] aio / timers: Convert aio_poll to use AioContext timers' deadline, Alex Bligh, 2013/08/06
- [Qemu-devel] [RFC] [PATCHv7 16/22] aio / timers: On timer modification, qemu_notify or aio_notify, Alex Bligh, 2013/08/06
- [Qemu-devel] [RFC] [PATCHv7 15/22] aio / timers: Convert mainloop to use timeout, Alex Bligh, 2013/08/06
- [Qemu-devel] [RFC] [PATCHv7 17/22] aio / timers: Introduce new API qemu_timer_new and friends, Alex Bligh, 2013/08/06
- [Qemu-devel] [RFC] [PATCHv7 18/22] aio / timers: Use all timerlists in icount warp calculations, Alex Bligh, 2013/08/06
- [Qemu-devel] [RFC] [PATCHv7 19/22] aio / timers: Add documentation and new format calls, Alex Bligh, 2013/08/06
- [Qemu-devel] [RFC] [PATCHv7 22/22] aio / timers: Remove legacy qemu_clock_deadline & qemu_timerlist_deadline,
Alex Bligh <=
- [Qemu-devel] [RFC] [PATCHv7 21/22] aio / timers: Add test harness for AioContext timers, Alex Bligh, 2013/08/06
- [Qemu-devel] [RFC] [PATCHv7 20/22] aio / timers: Remove alarm timers, Alex Bligh, 2013/08/06
- Re: [Qemu-devel] [RFC] [PATCHv7 00/22] aio / timers: Add AioContext timers and use ppoll, Alex Bligh, 2013/08/08