- Change the allproc_lock to use a macro, ALLPROC_LOCK(how), instead

  of explicit calls to lockmgr.  Also provides macros for the flags
  pased to specify shared, exclusive or release which map to the
  lockmgr flags.  This is so that the use of lockmgr can be easily
  replaced with optimized reader-writer locks.
- Add some locking that I missed the first time.

4 files changed, 15 insertions, 15 deletions

diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 3bc4d11..b1da607 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -360,7 +360,7 @@ loop:
 
 	pp = NULL;
 	ppri = INT_MIN;
-	lockmgr(&allproc_lock, LK_SHARED, NULL, CURPROC);
+	ALLPROC_LOCK(AP_SHARED);
 	for (p = allproc.lh_first; p != 0; p = p->p_list.le_next) {
 		mtx_enter(&sched_lock, MTX_SPIN);
 		if (p->p_stat == SRUN &&
@@ -383,7 +383,7 @@ loop:
 		}
 		mtx_exit(&sched_lock, MTX_SPIN);
 	}
-	lockmgr(&allproc_lock, LK_RELEASE, NULL, CURPROC);
+	ALLPROC_LOCK(AP_RELEASE);
 
 	/*
 	 * Nothing to do, back to sleep.
@@ -443,7 +443,7 @@ int action;
 
 	outp = outp2 = NULL;
 	outpri = outpri2 = INT_MIN;
-	lockmgr(&allproc_lock, LK_SHARED, NULL, CURPROC);
+	ALLPROC_LOCK(AP_SHARED);
 retry:
 	for (p = allproc.lh_first; p != 0; p = p->p_list.le_next) {
 		struct vmspace *vm;
@@ -516,7 +516,7 @@ retry:
 			}
 		}
 	}
-	lockmgr(&allproc_lock, LK_RELEASE, NULL, CURPROC);
+	ALLPROC_LOCK(AP_RELEASE);
 	/*
 	 * If we swapped something out, and another process needed memory,
 	 * then wakeup the sched process.
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index 9ed122e..3e573d7 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -78,7 +78,7 @@ loadav(struct loadavg *avg)
 	register int i, nrun;
 	register struct proc *p;
 
-	lockmgr(&allproc_lock, LK_SHARED, NULL, CURPROC);
+	ALLPROC_LOCK(AP_SHARED);
 	for (nrun = 0, p = allproc.lh_first; p != 0; p = p->p_list.le_next) {
 		switch (p->p_stat) {
 		case SSLEEP:
@@ -93,7 +93,7 @@ loadav(struct loadavg *avg)
 			nrun++;
 		}
 	}
-	lockmgr(&allproc_lock, LK_RELEASE, NULL, CURPROC);
+	ALLPROC_LOCK(AP_RELEASE);
 	for (i = 0; i < 3; i++)
 		avg->ldavg[i] = (cexp[i] * avg->ldavg[i] +
 		    nrun * FSCALE * (FSCALE - cexp[i])) >> FSHIFT;
@@ -151,7 +151,7 @@ vmtotal(SYSCTL_HANDLER_ARGS)
 	/*
 	 * Calculate process statistics.
 	 */
-	lockmgr(&allproc_lock, LK_SHARED, NULL, CURPROC);
+	ALLPROC_LOCK(AP_SHARED);
 	for (p = allproc.lh_first; p != 0; p = p->p_list.le_next) {
 		if (p->p_flag & P_SYSTEM)
 			continue;
@@ -202,7 +202,7 @@ vmtotal(SYSCTL_HANDLER_ARGS)
 		if (paging)
 			totalp->t_pw++;
 	}
-	lockmgr(&allproc_lock, LK_RELEASE, NULL, CURPROC);
+	ALLPROC_LOCK(AP_RELEASE);
 	/*
 	 * Calculate object memory usage statistics.
 	 */
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 0b079c3..ddb9ab7 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -1620,16 +1620,16 @@ vm_object_in_map( object)
 	vm_object_t object;
 {
 	struct proc *p;
-	lockmgr(&allproc_lock, LK_SHARED, NULL, CURPROC);
+	ALLPROC_LOCK(AP_SHARED);
 	for (p = allproc.lh_first; p != 0; p = p->p_list.le_next) {
 		if( !p->p_vmspace /* || (p->p_flag & (P_SYSTEM|P_WEXIT)) */)
 			continue;
 		if( _vm_object_in_map(&p->p_vmspace->vm_map, object, 0)) {
-			lockmgr(&allproc_lock, LK_RELEASE, NULL, CURPROC);
+			ALLPROC_LOCK(AP_RELEASE);
 			return 1;
 		}
 	}
-	lockmgr(&allproc_lock, LK_RELEASE, NULL, CURPROC);
+	ALLPROC_LOCK(AP_RELEASE);
 	if( _vm_object_in_map( kernel_map, object, 0))
 		return 1;
 	if( _vm_object_in_map( kmem_map, object, 0))
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 90ab288..6a52166 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -1132,7 +1132,7 @@ rescan0:
 	if ((vm_swap_size < 64 || swap_pager_full) && vm_page_count_min()) {
 		bigproc = NULL;
 		bigsize = 0;
-		lockmgr(&allproc_lock, LK_SHARED, NULL, CURPROC);
+		ALLPROC_LOCK(AP_SHARED);
 		for (p = allproc.lh_first; p != 0; p = p->p_list.le_next) {
 			/*
 			 * if this is a system process, skip it
@@ -1165,7 +1165,7 @@ rescan0:
 				bigsize = size;
 			}
 		}
-		lockmgr(&allproc_lock, LK_RELEASE, NULL, CURPROC);
+		ALLPROC_LOCK(AP_RELEASE);
 		if (bigproc != NULL) {
 			killproc(bigproc, "out of swap space");
 			bigproc->p_estcpu = 0;
@@ -1450,7 +1450,7 @@ vm_daemon()
 		 * process is swapped out -- deactivate pages
 		 */
 
-		lockmgr(&allproc_lock, LK_SHARED, NULL, CURPROC);
+		ALLPROC_LOCK(AP_SHARED);
 		for (p = allproc.lh_first; p != 0; p = p->p_list.le_next) {
 			vm_pindex_t limit, size;
 
@@ -1492,7 +1492,7 @@ vm_daemon()
 				    &p->p_vmspace->vm_map, limit);
 			}
 		}
-		lockmgr(&allproc_lock, LK_RELEASE, NULL, CURPROC);
+		ALLPROC_LOCK(AP_RELEASE);
 	}
 }
 #endif