summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkbyanc <kbyanc@FreeBSD.org>2002-06-12 02:08:18 +0000
committerkbyanc <kbyanc@FreeBSD.org>2002-06-12 02:08:18 +0000
commit052b70fe671743d5604e1dd3471927243c9a7bdb (patch)
tree06f957285d241cdd9d50030294ac0495622a1c42
parent64df5969679c3ad7b7f9452c2dcaee6a0621e26a (diff)
downloadFreeBSD-src-052b70fe671743d5604e1dd3471927243c9a7bdb.zip
FreeBSD-src-052b70fe671743d5604e1dd3471927243c9a7bdb.tar.gz
Make nselcol, the number of select collisions since boot, unsigned as
negative collisions simply doesn't make sense. PR: (one small part of) 19720 Approved by: alfred
-rw-r--r--sys/kern/sys_generic.c12
-rw-r--r--sys/sys/systm.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 8a94b0c..bca9f14 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -713,8 +713,8 @@ done:
*/
struct mtx sellock;
struct cv selwait;
-int nselcoll; /* Select collisions since boot */
-SYSCTL_INT(_kern, OID_AUTO, nselcoll, CTLFLAG_RD, &nselcoll, 0, "");
+u_int nselcoll; /* Select collisions since boot */
+SYSCTL_UINT(_kern, OID_AUTO, nselcoll, CTLFLAG_RD, &nselcoll, 0, "");
/*
* Select system call.
@@ -744,8 +744,8 @@ select(td, uap)
fd_mask s_selbits[howmany(2048, NFDBITS)];
fd_mask *ibits[3], *obits[3], *selbits, *sbp;
struct timeval atv, rtv, ttv;
- int ncoll, error, timo;
- u_int nbufbytes, ncpbytes, nfdbits;
+ int error, timo;
+ u_int ncoll, nbufbytes, ncpbytes, nfdbits;
if (uap->nd < 0)
return (EINVAL);
@@ -955,8 +955,8 @@ poll(td, uap)
caddr_t bits;
char smallbits[32 * sizeof(struct pollfd)];
struct timeval atv, rtv, ttv;
- int ncoll, error = 0, timo;
- u_int nfds;
+ int error = 0, timo;
+ u_int ncoll, nfds;
size_t ni;
nfds = SCARG(uap, nfds);
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 21ccf70..4ac9191 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -57,7 +57,7 @@ extern char copyright[]; /* system copyright */
extern int nswap; /* size of swap space */
-extern int nselcoll; /* select collisions since boot */
+extern u_int nselcoll; /* select collisions since boot */
extern struct mtx sellock; /* select lock variable */
extern struct cv selwait; /* select conditional variable */
OpenPOWER on IntegriCloud