diff options
| author | Madhavan Venkataraman <Madhavan.Venkataraman@Sun.COM> | 2009-04-10 07:14:10 -0700 |
|---|---|---|
| committer | Madhavan Venkataraman <Madhavan.Venkataraman@Sun.COM> | 2009-04-10 07:14:10 -0700 |
| commit | 51b32bdd07bc63a6e416c5759f0f445147703107 (patch) | |
| tree | 649c9f6f9d9ac24c56450f908276b1f83d1c4ff0 /usr/src/uts/common/syscall/lwp_timer.c | |
| parent | 845e9415a97ec0124f099537b21fc0364883850f (diff) | |
| download | illumos-gate-51b32bdd07bc63a6e416c5759f0f445147703107.tar.gz | |
6789031 High resolution timers needed for time-sensitive applications
6822357 assertion failed: expiration > 0, file: ../../common/os/cyclic.c, line: 3048
6827248 Empty callout lists need to be cleaned up more proactively
6827371 Solaris must support absolute and relative timers at the callout level
Diffstat (limited to 'usr/src/uts/common/syscall/lwp_timer.c')
| -rw-r--r-- | usr/src/uts/common/syscall/lwp_timer.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/usr/src/uts/common/syscall/lwp_timer.c b/usr/src/uts/common/syscall/lwp_timer.c index 134e42b06e..7d4592bbcb 100644 --- a/usr/src/uts/common/syscall/lwp_timer.c +++ b/usr/src/uts/common/syscall/lwp_timer.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -55,7 +55,7 @@ lwp_timer_timeout(void *arg) { lwp_timer_t *lwptp = arg; kthread_t *t = lwptp->lwpt_thread; - timespec_t now; + timespec_t now, delta; mutex_enter(&t->t_delay_lock); gethrestime(&now); @@ -68,10 +68,11 @@ lwp_timer_timeout(void *arg) (lwptp->lwpt_rqtime.tv_sec == now.tv_sec && lwptp->lwpt_rqtime.tv_nsec > now.tv_nsec))) { lwptp->lwpt_imm_timeout = 0; + delta = lwptp->lwpt_rqtime; + timespecsub(&delta, &now); lwptp->lwpt_id = timeout_generic(CALLOUT_REALTIME, - lwp_timer_timeout, lwptp, - TICK_TO_NSEC(timespectohz(&lwptp->lwpt_rqtime, now)), - nsec_per_tick, CALLOUT_FLAG_HRESTIME); + lwp_timer_timeout, lwptp, ts2hrt(&delta), nsec_per_tick, + (CALLOUT_FLAG_HRESTIME | CALLOUT_FLAG_ROUNDUP)); } else { /* * Set the thread running only if it is asleep on @@ -144,7 +145,7 @@ err: int lwp_timer_enqueue(lwp_timer_t *lwptp) { - timespec_t now; + timespec_t now, delta; ASSERT(lwptp->lwpt_thread == curthread); ASSERT(MUTEX_HELD(&curthread->t_delay_lock)); @@ -157,10 +158,11 @@ lwp_timer_enqueue(lwp_timer_t *lwptp) * Queue the timeout. */ lwptp->lwpt_imm_timeout = 0; + delta = lwptp->lwpt_rqtime; + timespecsub(&delta, &now); lwptp->lwpt_id = timeout_generic(CALLOUT_REALTIME, - lwp_timer_timeout, lwptp, - TICK_TO_NSEC(timespectohz(&lwptp->lwpt_rqtime, now)), - nsec_per_tick, CALLOUT_FLAG_HRESTIME); + lwp_timer_timeout, lwptp, ts2hrt(&delta), nsec_per_tick, + (CALLOUT_FLAG_HRESTIME | CALLOUT_FLAG_ROUNDUP)); return (0); } |