Re: sys/param.h

[Jeroen Ruigrok/asmodai <asmodai@xxxxxx>]

-On [20030801 01:32], Matthew Dillon (dillon@xxxxxxxxxxxxxxxxxxxx) wrote:
>    You mean all the Pxxx stuff?  No, we aren't going to use that any 
>    more.  That is used in 4.x and 5.x because kernel threads are scheduled
>    by the user process scheduler.  In DragonFly kernel threads are
>    scheduled by the LWKT scheduler and (typically) have a set fixed
>    priority based on whether the thread represents an interrupt, software
>    interrupt, mainline kernel code, etc.  You may have noticed that I removed
>    all the priority junk from tsleep, only flags are passed now.

I need to check out the PCATCH stuff, but for now I cleaned up the
others.

Find patch attached.

-- 
Jeroen Ruigrok van der Werven <asmodai(at)wxs.nl> / asmodai
PGP fingerprint: 2D92 980E 45FE 2C28 9DB7  9D88 97E6 839B 2EAC 625B
http://www.tendra.org/   | http://www.in-nomine.org/~asmodai/diary/
Man is the Dream of the dolphin...

Index: src/contrib/ipfilter/ip_compat.h
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/contrib/ipfilter/ip_compat.h,v
retrieving revision 1.1
diff -u -r1.1 ip_compat.h
--- src/contrib/ipfilter/ip_compat.h	17 Jun 2003 02:44:51 -0000	1.1
+++ src/contrib/ipfilter/ip_compat.h	1 Aug 2003 06:56:53 -0000
@@ -553,7 +553,7 @@
 
 # if defined(sun) && !defined(linux) || defined(__sgi)
 #  define	UIOMOVE(a,b,c,d)	uiomove((caddr_t)a,b,c,d)
-#  define	SLEEP(id, n)	sleep((id), PZERO+1)
+#  define	SLEEP(id, n)	sleep((id), 1)
 #  define	WAKEUP(id)	wakeup(id)
 #  define	KFREE(x)	kmem_free((char *)(x), sizeof(*(x)))
 #  define	KFREES(x,s)	kmem_free((char *)(x), (s))
@@ -609,7 +609,7 @@
 #   define	KFREES(x,s)	FREE((x), M_TEMP)
 #  endif /* M_PFIL */
 #  define	UIOMOVE(a,b,c,d)	uiomove(a,b,d)
-#  define	SLEEP(id, n)	tsleep((id), PPAUSE|PCATCH, n, 0)
+#  define	SLEEP(id, n)	tsleep((id), PCATCH, n, 0)
 #  define	WAKEUP(id)	wakeup(id)
 # endif /* BSD */
 # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199407)) || \
Index: src/share/man/man9/VOP_FSYNC.9
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/share/man/man9/VOP_FSYNC.9,v
retrieving revision 1.2
diff -u -r1.2 VOP_FSYNC.9
--- src/share/man/man9/VOP_FSYNC.9	17 Jun 2003 04:37:01 -0000	1.2
+++ src/share/man/man9/VOP_FSYNC.9	1 Aug 2003 06:54:13 -0000
@@ -110,7 +110,7 @@
 	s = splbio();
 	while (vp->v_numoutput) {
 	    vp->v_flag |= VBWAIT;
-	    tsleep((caddr_t)&vp->v_numoutput, PRIBIO + 1, "vopfsn");
+	    tsleep((caddr_t)&vp->v_numoutput, 0, "vopfsn");
 	}
 	splx(s);
 #ifdef DIAGNOSTIC
Index: src/share/man/man9/VOP_LOCK.9
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/share/man/man9/VOP_LOCK.9,v
retrieving revision 1.3
diff -u -r1.3 VOP_LOCK.9
--- src/share/man/man9/VOP_LOCK.9	27 Jul 2003 05:36:06 -0000	1.3
+++ src/share/man/man9/VOP_LOCK.9	1 Aug 2003 06:52:48 -0000
@@ -123,7 +123,7 @@
 start:
     while (vp->v_flag & VXLOCK) {
 	vp->v_flag |= VXWANT;
-	tsleep((caddr_t)vp, PINOD, "voplk1", 0);
+	tsleep((caddr_t)vp, 0, "voplk1", 0);
     }
     if (vp->v_tag == VT_NON)
 	return ENOENT;
@@ -131,7 +131,7 @@
     vop = VTOVON(vp);
     if (vop->von_flag & VON_LOCKED) {
 	vop->von_flag |= VON_WANTED;
-	tsleep((caddr_t) vop, PINOD, "voplk2", 0);
+	tsleep((caddr_t) vop, 0, "voplk2", 0);
 	goto start;
     }
 
Index: src/share/man/man9/spl.9
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/share/man/man9/spl.9,v
retrieving revision 1.2
diff -u -r1.2 spl.9
--- src/share/man/man9/spl.9	17 Jun 2003 04:37:01 -0000	1.2
+++ src/share/man/man9/spl.9	1 Aug 2003 06:55:28 -0000
@@ -152,7 +152,7 @@
 	if (!(sc->flags & FOO_READY)) {
 		/* Not ready, must sleep on resource. */
 		sc->flags |= FOO_ASLEEP;
-		error = tsleep(sc, PZERO, "foordy", 0);
+		error = tsleep(sc, 0, "foordy", 0);
 		sc->flags &= ~FOO_ASLEEP;
 	}
 	sc->flags &= ~FOO_READY;
Index: src/sys/contrib/ipfilter/netinet/ip_compat.h
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/sys/contrib/ipfilter/netinet/ip_compat.h,v
retrieving revision 1.3
diff -u -r1.3 ip_compat.h
--- src/sys/contrib/ipfilter/netinet/ip_compat.h	19 Jul 2003 21:14:16 -0000	1.3
+++ src/sys/contrib/ipfilter/netinet/ip_compat.h	1 Aug 2003 06:55:15 -0000
@@ -555,7 +555,7 @@
 
 # if defined(sun) && !defined(linux) || defined(__sgi)
 #  define	UIOMOVE(a,b,c,d)	uiomove((caddr_t)a,b,c,d)
-#  define	SLEEP(id, n)	sleep((id), PZERO+1)
+#  define	SLEEP(id, n)	sleep((id), 1)
 #  define	WAKEUP(id)	wakeup(id)
 #  define	KFREE(x)	kmem_free((char *)(x), sizeof(*(x)))
 #  define	KFREES(x,s)	kmem_free((char *)(x), (s))
Index: src/sys/dev/hfa/fore_stats.c
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/sys/dev/hfa/fore_stats.c,v
retrieving revision 1.3
diff -u -r1.3 fore_stats.c
--- src/sys/dev/hfa/fore_stats.c	19 Jul 2003 21:14:21 -0000	1.3
+++ src/sys/dev/hfa/fore_stats.c	1 Aug 2003 06:56:09 -0000
@@ -82,7 +82,7 @@
 #if (defined(BSD) && (BSD >= 199103))
 		sst = tsleep((caddr_t)&fup->fu_stats, PCATCH, "fore", 0);
 #else
-		sst = sleep((caddr_t)&fup->fu_stats, PWAIT|PCATCH);
+		sst = sleep((caddr_t)&fup->fu_stats, PCATCH);
 		if (sst != 0)
 			sst = EINTR;
 #endif
@@ -140,7 +140,7 @@
 #if (defined(BSD) && (BSD >= 199103))
 		sst = tsleep((caddr_t)&fup->fu_stats, PCATCH, "fore", 0);
 #else
-		sst = sleep((caddr_t)&fup->fu_stats, PWAIT|PCATCH);
+		sst = sleep((caddr_t)&fup->fu_stats, PCATCH);
 		if (sst != 0)
 			sst = EINTR;
 #endif
Index: src/sys/dev/sound/pcm/channel.c
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/sys/dev/sound/pcm/channel.c,v
retrieving revision 1.5
diff -u -r1.5 channel.c
--- src/sys/dev/sound/pcm/channel.c	30 Jul 2003 00:20:39 -0000	1.5
+++ src/sys/dev/sound/pcm/channel.c	1 Aug 2003 06:53:57 -0000
@@ -131,7 +131,7 @@
 
 	CHN_LOCKASSERT(c);
 #ifdef USING_MUTEX
-	ret = msleep(bs, c->lock, PRIBIO | PCATCH, str, timeout);
+	ret = msleep(bs, c->lock, PCATCH, str, timeout);
 #else
 	ret = tsleep(bs, PCATCH, str, timeout);
 #endif
Index: src/sys/i386/boot/dosboot/inode.h
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/sys/i386/boot/dosboot/inode.h,v
retrieving revision 1.2
diff -u -r1.2 inode.h
--- src/sys/i386/boot/dosboot/inode.h	17 Jun 2003 04:28:34 -0000	1.2
+++ src/sys/i386/boot/dosboot/inode.h	1 Aug 2003 06:52:32 -0000
@@ -136,7 +136,7 @@
 #define	ILOCK(ip) { \
 	while ((ip)->i_flag & ILOCKED) { \
 		(ip)->i_flag |= IWANT; \
-		(void) sleep((caddr_t)(ip), PINOD); \
+		(void) sleep((caddr_t)(ip), 0); \
 	} \
 	(ip)->i_flag |= ILOCKED; \
 }
Index: src/sys/i386/boot/dosboot/sysparam.h
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/sys/i386/boot/dosboot/sysparam.h,v
retrieving revision 1.4
diff -u -r1.4 sysparam.h
--- src/sys/i386/boot/dosboot/sysparam.h	19 Jul 2003 21:14:33 -0000	1.4
+++ src/sys/i386/boot/dosboot/sysparam.h	1 Aug 2003 06:51:33 -0000
@@ -98,19 +98,6 @@
  * Priorities.  Note that with 32 run queues, differences less than 4 are
  * insignificant.
  */
-#if 0
-#define	PSWP	0
-#define	PVM	4
-#define	PINOD	8
-#define	PRIBIO	16
-#define	PVFS	20
-#define	PZERO	22		/* No longer magic, shouldn't be here.  XXX */
-#define	PSOCK	24
-#define	PWAIT	32
-#define	PLOCK	36
-#define	PPAUSE	40
-#define	PUSER	50
-#endif
 #define	MAXPRI	127		/* Priorities range from 0 through MAXPRI. */
 
 #define	PRIMASK	0x0ff