diff options
author | mm <mm@FreeBSD.org> | 2013-03-05 15:33:28 +0000 |
---|---|---|
committer | mm <mm@FreeBSD.org> | 2013-03-05 15:33:28 +0000 |
commit | a31c6079676b4aaa6371ce4457c75561ea013088 (patch) | |
tree | 9b8fec81654308eacb267f2167f3a17784060aa9 | |
parent | 7536305c3efabe443f1f43800fac6cab0a4cab1e (diff) | |
download | FreeBSD-src-a31c6079676b4aaa6371ce4457c75561ea013088.zip FreeBSD-src-a31c6079676b4aaa6371ce4457c75561ea013088.tar.gz |
Update vendor/illumos/dist and vendor-sys/illumos/dist
to illumos-gate 13975:ef6409bc370f
Illumos ZFS issues:
3582 zfs_delay() should support a variable resolution
3584 DTrace sdt probes for ZFS txg states
-rw-r--r-- | lib/libzpool/common/kernel.c | 35 | ||||
-rw-r--r-- | lib/libzpool/common/sys/zfs_context.h | 2 |
2 files changed, 37 insertions, 0 deletions
diff --git a/lib/libzpool/common/kernel.c b/lib/libzpool/common/kernel.c index 9628094..4dd614f 100644 --- a/lib/libzpool/common/kernel.c +++ b/lib/libzpool/common/kernel.c @@ -329,6 +329,41 @@ top: return (1); } +/*ARGSUSED*/ +clock_t +cv_timedwait_hires(kcondvar_t *cv, kmutex_t *mp, hrtime_t tim, hrtime_t res, + int flag) +{ + int error; + timestruc_t ts; + hrtime_t delta; + + ASSERT(flag == 0); + +top: + delta = tim - gethrtime(); + if (delta <= 0) + return (-1); + + ts.tv_sec = delta / NANOSEC; + ts.tv_nsec = delta % NANOSEC; + + ASSERT(mutex_owner(mp) == curthread); + mp->m_owner = NULL; + error = cond_reltimedwait(cv, &mp->m_lock, &ts); + mp->m_owner = curthread; + + if (error == ETIME) + return (-1); + + if (error == EINTR) + goto top; + + ASSERT(error == 0); + + return (1); +} + void cv_signal(kcondvar_t *cv) { diff --git a/lib/libzpool/common/sys/zfs_context.h b/lib/libzpool/common/sys/zfs_context.h index 7802da4..a46c657 100644 --- a/lib/libzpool/common/sys/zfs_context.h +++ b/lib/libzpool/common/sys/zfs_context.h @@ -254,6 +254,8 @@ extern void cv_init(kcondvar_t *cv, char *name, int type, void *arg); extern void cv_destroy(kcondvar_t *cv); extern void cv_wait(kcondvar_t *cv, kmutex_t *mp); extern clock_t cv_timedwait(kcondvar_t *cv, kmutex_t *mp, clock_t abstime); +extern clock_t cv_timedwait_hires(kcondvar_t *cvp, kmutex_t *mp, hrtime_t tim, + hrtime_t res, int flag); extern void cv_signal(kcondvar_t *cv); extern void cv_broadcast(kcondvar_t *cv); |