[Midnightbsd-cvs] src [7941] trunk/sys: honor db_pager_quit

[laffer1 at midnightbsd.org]

Revision: 7941
          http://svnweb.midnightbsd.org/src/?rev=7941
Author:   laffer1
Date:     2016-09-14 17:45:47 -0400 (Wed, 14 Sep 2016)
Log Message:
-----------
honor db_pager_quit

Modified Paths:
--------------
    trunk/sys/kern/kern_malloc.c
    trunk/sys/kern/subr_witness.c
    trunk/sys/vm/uma_core.c

Modified: trunk/sys/kern/kern_malloc.c
===================================================================
--- trunk/sys/kern/kern_malloc.c	2016-09-14 21:42:08 UTC (rev 7940)
+++ trunk/sys/kern/kern_malloc.c	2016-09-14 21:45:47 UTC (rev 7941)
@@ -963,6 +963,8 @@
 		db_printf("%18s %12ju %12juK %12ju\n",
 		    mtp->ks_shortdesc, allocs - frees,
 		    (alloced - freed + 1023) / 1024, allocs);
+		if (db_pager_quit)
+			break;
 	}
 }
 
@@ -992,6 +994,8 @@
 		if (mtip->mti_zone != subzone)
 			continue;
 		db_printf("%s\n", mtp->ks_shortdesc);
+		if (db_pager_quit)
+			break;
 	}
 }
 #endif /* MALLOC_DEBUG_MAXZONES > 1 */

Modified: trunk/sys/kern/subr_witness.c
===================================================================
--- trunk/sys/kern/subr_witness.c	2016-09-14 21:42:08 UTC (rev 7940)
+++ trunk/sys/kern/subr_witness.c	2016-09-14 21:45:47 UTC (rev 7941)
@@ -943,6 +943,8 @@
 	indent++;
 	WITNESS_INDEX_ASSERT(w->w_index);
 	for (i = 1; i <= w_max_used_index; i++) {
+		if (db_pager_quit)
+			return;
 		if (w_rmatrix[w->w_index][i] & WITNESS_PARENT)
 			witness_ddb_display_descendants(prnt, &w_data[i],
 			    indent);
@@ -961,6 +963,8 @@
 
 		/* This lock has no anscestors - display its descendants. */
 		witness_ddb_display_descendants(prnt, w, 0);
+		if (db_pager_quit)
+			return;
 	}
 }
 	
@@ -982,6 +986,8 @@
 	 */
 	prnt("Sleep locks:\n");
 	witness_ddb_display_list(prnt, &w_sleep);
+	if (db_pager_quit)
+		return;
 	
 	/*
 	 * Now do spin locks which have been acquired at least once.
@@ -988,6 +994,8 @@
 	 */
 	prnt("\nSpin locks:\n");
 	witness_ddb_display_list(prnt, &w_spin);
+	if (db_pager_quit)
+		return;
 	
 	/*
 	 * Finally, any locks which have not been acquired yet.
@@ -998,6 +1006,8 @@
 			continue;
 		prnt("%s (type: %s, depth: %d)\n", w->w_name,
 		    w->w_class->lc_name, w->w_ddb_level);
+		if (db_pager_quit)
+			return;
 	}
 }
 #endif /* DDB */
@@ -2393,6 +2403,8 @@
 			db_printf("Process %d (%s) thread %p (%d)\n", p->p_pid,
 			    p->p_comm, td, td->td_tid);
 			witness_ddb_list(td);
+			if (db_pager_quit)
+				return;
 		}
 	}
 }

Modified: trunk/sys/vm/uma_core.c
===================================================================
--- trunk/sys/vm/uma_core.c	2016-09-14 21:42:08 UTC (rev 7940)
+++ trunk/sys/vm/uma_core.c	2016-09-14 21:45:47 UTC (rev 7941)
@@ -3345,6 +3345,8 @@
 			    (uintmax_t)kz->uk_size,
 			    (intmax_t)(allocs - frees), cachefree,
 			    (uintmax_t)allocs, sleeps);
+			if (db_pager_quit)
+				return;
 		}
 	}
 }