Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/cddl/osnet rename delay to xdelay to avoid conflicts.
details: https://anonhg.NetBSD.org/src/rev/26941f0c7e8d
branches: trunk
changeset: 787512:26941f0c7e8d
user: christos <christos%NetBSD.org@localhost>
date: Fri Jun 21 16:22:45 2013 +0000
description:
rename delay to xdelay to avoid conflicts.
diffstat:
external/cddl/osnet/dist/lib/libzpool/common/taskq.c | 2 +-
external/cddl/osnet/dist/uts/common/dtrace/dtrace.c | 2 +-
external/cddl/osnet/dist/uts/common/dtrace/lockstat.c | 2 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c | 2 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c | 2 +-
external/cddl/osnet/lib/libzpool/kernel.c | 6 +++---
external/cddl/osnet/sys/kern/taskq.c | 4 ++--
external/cddl/osnet/sys/sys/systm.h | 5 ++---
external/cddl/osnet/sys/sys/zfs_context.h | 4 ++--
9 files changed, 14 insertions(+), 15 deletions(-)
diffs (142 lines):
diff -r df3b5d879fab -r 26941f0c7e8d external/cddl/osnet/dist/lib/libzpool/common/taskq.c
--- a/external/cddl/osnet/dist/lib/libzpool/common/taskq.c Fri Jun 21 15:54:08 2013 +0000
+++ b/external/cddl/osnet/dist/lib/libzpool/common/taskq.c Fri Jun 21 16:22:45 2013 +0000
@@ -74,7 +74,7 @@
* 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 */
diff -r df3b5d879fab -r 26941f0c7e8d external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
--- a/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Fri Jun 21 15:54:08 2013 +0000
+++ b/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Fri Jun 21 16:22:45 2013 +0000
@@ -14947,7 +14947,7 @@
* 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
diff -r df3b5d879fab -r 26941f0c7e8d external/cddl/osnet/dist/uts/common/dtrace/lockstat.c
--- a/external/cddl/osnet/dist/uts/common/dtrace/lockstat.c Fri Jun 21 15:54:08 2013 +0000
+++ b/external/cddl/osnet/dist/uts/common/dtrace/lockstat.c Fri Jun 21 16:22:45 2013 +0000
@@ -149,7 +149,7 @@
* will flush that CPU's store buffer. Either way we're covered.
*/
do {
- delay(1);
+ xdelay(1);
} while (lockstat_active_threads());
}
diff -r df3b5d879fab -r 26941f0c7e8d external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c Fri Jun 21 15:54:08 2013 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c Fri Jun 21 16:22:45 2013 +0000
@@ -483,7 +483,7 @@
* dnode.
*/
while (refcount_count(&dn->dn_holds) > 0)
- delay(1);
+ xdelay(1);
dnode_destroy(dn);
}
diff -r df3b5d879fab -r 26941f0c7e8d external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c Fri Jun 21 15:54:08 2013 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c Fri Jun 21 16:22:45 2013 +0000
@@ -401,7 +401,7 @@
*/
mutex_exit(&dn->dn_dbufs_mtx);
if (evicting)
- delay(1);
+ xdelay(1);
pass++;
ASSERT(pass < 100); /* sanity check */
} while (progress);
diff -r df3b5d879fab -r 26941f0c7e8d external/cddl/osnet/lib/libzpool/kernel.c
--- a/external/cddl/osnet/lib/libzpool/kernel.c Fri Jun 21 15:54:08 2013 +0000
+++ b/external/cddl/osnet/lib/libzpool/kernel.c Fri Jun 21 16:22:45 2013 +0000
@@ -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 @@
*/
void
-delay(clock_t ticks)
+xdelay(clock_t ticks)
{
poll(0, 0, ticks * (1000 / hz));
}
diff -r df3b5d879fab -r 26941f0c7e8d external/cddl/osnet/sys/kern/taskq.c
--- a/external/cddl/osnet/sys/kern/taskq.c Fri Jun 21 15:54:08 2013 +0000
+++ b/external/cddl/osnet/sys/kern/taskq.c Fri Jun 21 16:22:45 2013 +0000
@@ -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 @@
* 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);
diff -r df3b5d879fab -r 26941f0c7e8d external/cddl/osnet/sys/sys/systm.h
--- a/external/cddl/osnet/sys/sys/systm.h Fri Jun 21 15:54:08 2013 +0000
+++ b/external/cddl/osnet/sys/sys/systm.h Fri Jun 21 16:22:45 2013 +0000
@@ -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)
diff -r df3b5d879fab -r 26941f0c7e8d external/cddl/osnet/sys/sys/zfs_context.h
--- a/external/cddl/osnet/sys/sys/zfs_context.h Fri Jun 21 15:54:08 2013 +0000
+++ b/external/cddl/osnet/sys/sys/zfs_context.h Fri Jun 21 16:22:45 2013 +0000
@@ -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 @@
#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) \
Home |
Main Index |
Thread Index |
Old Index