From 8f7e4eb56883666aeefd6fe3949fa9fcbebfbc34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Mon, 11 Jun 2001 21:54:19 +0000
Subject: [PATCH] Rename nextpid to lastpid and externalize it.

---
 sys/kern/kern_fork.c | 14 +++++++-------
 sys/sys/proc.h       |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 6774f646171..1c5336c4b92 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -158,12 +158,12 @@ rfork(p, uap)
 
 
 int	nprocs = 1;				/* process 0 */
-static int nextpid = 0;
-SYSCTL_INT(_kern, OID_AUTO, lastpid, CTLFLAG_RD, &nextpid, 0, 
+int	lastpid = 0;
+SYSCTL_INT(_kern, OID_AUTO, lastpid, CTLFLAG_RD, &lastpid, 0, 
     "Last used PID");
 
 /*
- * Random component to nextpid generation.  We mix in a random factor to make
+ * Random component to lastpid generation.  We mix in a random factor to make
  * it a little harder to predict.  We sanity check the modulus value to avoid
  * doing it in critical paths.  Don't let it be too small or we pointlessly
  * waste randomness entropy, and don't let it be impossibly large.  Using a
@@ -302,13 +302,13 @@ fork1(p1, flags, procp)
 
 	/*
 	 * Find an unused process ID.  We remember a range of unused IDs
-	 * ready to use (from nextpid+1 through pidchecked-1).
+	 * ready to use (from lastpid+1 through pidchecked-1).
 	 *
 	 * If RFHIGHPID is set (used during system boot), do not allocate
 	 * low-numbered pids.
 	 */
 	sx_xlock(&allproc_lock);
-	trypid = nextpid + 1;
+	trypid = lastpid + 1;
 	if (flags & RFHIGHPID) {
 		if (trypid < 10) {
 			trypid = 10;
@@ -365,12 +365,12 @@ again:
 	}
 
 	/*
-	 * RFHIGHPID does not mess with the nextpid counter during boot.
+	 * RFHIGHPID does not mess with the lastpid counter during boot.
 	 */
 	if (flags & RFHIGHPID)
 		pidchecked = 0;
 	else
-		nextpid = trypid;
+		lastpid = trypid;
 
 	p2 = newproc;
 	p2->p_stat = SIDL;			/* protect against others */
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 320166979e4..1d0b1de7e8c 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -486,6 +486,8 @@ extern struct proc *updateproc;		/* Process slot for syncer (sic). */
 
 extern struct vm_zone *proc_zone;
 
+extern int nextpid;
+
 /*
  * XXX macros for scheduler.  Shouldn't be here, but currently needed for
  * bounding the dubious p_estcpu inheritance in wait1().