Module Name: src
Committed By: christos
Date: Fri Jun 21 16:22:46 UTC 2013
Modified Files:
src/external/cddl/osnet/dist/lib/libzpool/common: taskq.c
src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c lockstat.c
src/external/cddl/osnet/dist/uts/common/fs/zfs: dnode.c dnode_sync.c
src/external/cddl/osnet/lib/libzpool: kernel.c
src/external/cddl/osnet/sys/kern: taskq.c
src/external/cddl/osnet/sys/sys: systm.h zfs_context.h
Log Message:
rename delay to xdelay to avoid conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/lib/libzpool/common/taskq.c
cvs rdiff -u -r1.22 -r1.23 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/uts/common/dtrace/lockstat.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/lib/libzpool/kernel.c
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/kern/taskq.c
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/sys/systm.h
cvs rdiff -u -r1.14 -r1.15 src/external/cddl/osnet/sys/sys/zfs_context.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/lib/libzpool/common/taskq.c
diff -u src/external/cddl/osnet/dist/lib/libzpool/common/taskq.c:1.3 src/external/cddl/osnet/dist/lib/libzpool/common/taskq.c:1.4
--- src/external/cddl/osnet/dist/lib/libzpool/common/taskq.c:1.3 Wed Dec 15 17:49:42 2010
+++ src/external/cddl/osnet/dist/lib/libzpool/common/taskq.c Fri Jun 21 12:22:45 2013
@@ -74,7 +74,7 @@ task_alloc(taskq_t *tq, int tqflags)
* the caller. So, we just delay for one second
* to throttle the allocation rate.
*/
- delay(hz);
+ xdelay(hz);
}
/* Clean up TQ_FRONT from tqflags before passing it to kmem */
Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.22 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.23
--- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.22 Sun Apr 14 12:52:47 2013
+++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Fri Jun 21 12:22:46 2013
@@ -14947,7 +14947,7 @@ dtrace_module_loaded(modctl_t *ctl)
* not a serious problem -- it just means that the module that we
* just loaded may not be immediately instrumentable.
*/
- delay(1);
+ xdelay(1);
}
static void
Index: src/external/cddl/osnet/dist/uts/common/dtrace/lockstat.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/lockstat.c:1.3 src/external/cddl/osnet/dist/uts/common/dtrace/lockstat.c:1.4
--- src/external/cddl/osnet/dist/uts/common/dtrace/lockstat.c:1.3 Sat Feb 27 18:43:53 2010
+++ src/external/cddl/osnet/dist/uts/common/dtrace/lockstat.c Fri Jun 21 12:22:46 2013
@@ -149,7 +149,7 @@ lockstat_disable(void *arg, dtrace_id_t
* will flush that CPU's store buffer. Either way we're covered.
*/
do {
- delay(1);
+ xdelay(1);
} while (lockstat_active_threads());
}
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c:1.3 src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c:1.4
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c:1.3 Sat Feb 27 18:43:53 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c Fri Jun 21 12:22:46 2013
@@ -483,7 +483,7 @@ dnode_special_close(dnode_t *dn)
* dnode.
*/
while (refcount_count(&dn->dn_holds) > 0)
- delay(1);
+ xdelay(1);
dnode_destroy(dn);
}
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c:1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c:1.5
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c:1.4 Thu May 6 18:26:55 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c Fri Jun 21 12:22:46 2013
@@ -401,7 +401,7 @@ dnode_evict_dbufs(dnode_t *dn)
*/
mutex_exit(&dn->dn_dbufs_mtx);
if (evicting)
- delay(1);
+ xdelay(1);
pass++;
ASSERT(pass < 100); /* sanity check */
} while (progress);
Index: src/external/cddl/osnet/lib/libzpool/kernel.c
diff -u src/external/cddl/osnet/lib/libzpool/kernel.c:1.7 src/external/cddl/osnet/lib/libzpool/kernel.c:1.8
--- src/external/cddl/osnet/lib/libzpool/kernel.c:1.7 Wed Jan 2 11:31:24 2013
+++ src/external/cddl/osnet/lib/libzpool/kernel.c Fri Jun 21 12:22:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kernel.c,v 1.7 2013/01/02 16:31:24 dsl Exp $ */
+/* $NetBSD: kernel.c,v 1.8 2013/06/21 16:22:46 christos Exp $ */
/*
* CDDL HEADER START
@@ -29,7 +29,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
#include <sys/cdefs.h>
-__RCSID("$NetBSD: kernel.c,v 1.7 2013/01/02 16:31:24 dsl Exp $");
+__RCSID("$NetBSD: kernel.c,v 1.8 2013/06/21 16:22:46 christos Exp $");
#include <sys/zfs_context.h>
#include <sys/sysctl.h>
@@ -496,7 +496,7 @@ kobj_get_filesize(struct _buf *file, uin
*/
void
-delay(clock_t ticks)
+xdelay(clock_t ticks)
{
poll(0, 0, ticks * (1000 / hz));
}
Index: src/external/cddl/osnet/sys/kern/taskq.c
diff -u src/external/cddl/osnet/sys/kern/taskq.c:1.2 src/external/cddl/osnet/sys/kern/taskq.c:1.3
--- src/external/cddl/osnet/sys/kern/taskq.c:1.2 Sun Feb 28 09:45:47 2010
+++ src/external/cddl/osnet/sys/kern/taskq.c Fri Jun 21 12:22:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: taskq.c,v 1.2 2010/02/28 14:45:47 haad Exp $ */
+/* $NetBSD: taskq.c,v 1.3 2013/06/21 16:22:46 christos Exp $ */
/*
* CDDL HEADER START
@@ -664,7 +664,7 @@ taskq_ent_alloc(taskq_t *tq, int flags)
* the caller. So, we just delay for one second
* to throttle the allocation rate.
*/
- delay(hz);
+ xdelay(hz);
}
tqe = kmem_cache_alloc(taskq_ent_cache, kmflags);
mutex_enter(&tq->tq_lock);
Index: src/external/cddl/osnet/sys/sys/systm.h
diff -u src/external/cddl/osnet/sys/sys/systm.h:1.3 src/external/cddl/osnet/sys/sys/systm.h:1.4
--- src/external/cddl/osnet/sys/sys/systm.h:1.3 Sat Feb 20 20:46:36 2010
+++ src/external/cddl/osnet/sys/sys/systm.h Fri Jun 21 12:22:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: systm.h,v 1.3 2010/02/21 01:46:36 darran Exp $ */
+/* $NetBSD: systm.h,v 1.4 2013/06/21 16:22:46 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -73,8 +73,7 @@
#define PAGEOFFSET (PAGESIZE - 1)
#define PAGEMASK (~PAGEOFFSET)
-#undef delay
-#define delay(x) kpause("soldelay", false, (x), NULL)
+#define xdelay(x) kpause("soldelay", false, (x), NULL)
#define xcopyin(u, k, s) copyin(u, k, s)
#define xcopyout(k, u, s) copyout(k, u, s)
Index: src/external/cddl/osnet/sys/sys/zfs_context.h
diff -u src/external/cddl/osnet/sys/sys/zfs_context.h:1.14 src/external/cddl/osnet/sys/sys/zfs_context.h:1.15
--- src/external/cddl/osnet/sys/sys/zfs_context.h:1.14 Wed Jan 2 11:31:24 2013
+++ src/external/cddl/osnet/sys/sys/zfs_context.h Fri Jun 21 12:22:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: zfs_context.h,v 1.14 2013/01/02 16:31:24 dsl Exp $ */
+/* $NetBSD: zfs_context.h,v 1.15 2013/06/21 16:22:46 christos Exp $ */
/*
* CDDL HEADER START
@@ -403,7 +403,7 @@ extern vnode_t *rootdir;
#define lbolt64 (gethrtime() >> 23)
#define hz 119 /* frequency when using gethrtime() >> 23 for lbolt */
-extern void delay(clock_t ticks);
+extern void xdelay(clock_t ticks);
#define gethrestime_sec() time(NULL)
#define gethrestime(t) \
