Date: Mon, 2 Jul 2012 16:14:52 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r238000 - in head/sys: kern vm Message-ID: <201207021614.q62GEqdj080544@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Mon Jul 2 16:14:52 2012 New Revision: 238000 URL: http://svn.freebsd.org/changeset/base/238000 Log: Honor db_pager_quit in 'show uma' and 'show malloc'. MFC after: 1 month Modified: head/sys/kern/kern_malloc.c head/sys/vm/uma_core.c Modified: head/sys/kern/kern_malloc.c ============================================================================== --- head/sys/kern/kern_malloc.c Mon Jul 2 16:14:35 2012 (r237999) +++ head/sys/kern/kern_malloc.c Mon Jul 2 16:14:52 2012 (r238000) @@ -1000,6 +1000,8 @@ DB_SHOW_COMMAND(malloc, db_show_malloc) db_printf("%18s %12ju %12juK %12ju\n", mtp->ks_shortdesc, allocs - frees, (alloced - freed + 1023) / 1024, allocs); + if (db_pager_quit) + break; } } @@ -1029,6 +1031,8 @@ DB_SHOW_COMMAND(multizone_matches, db_sh if (mtip->mti_zone != subzone) continue; db_printf("%s\n", mtp->ks_shortdesc); + if (db_pager_quit) + break; } } #endif /* MALLOC_DEBUG_MAXZONES > 1 */ Modified: head/sys/vm/uma_core.c ============================================================================== --- head/sys/vm/uma_core.c Mon Jul 2 16:14:35 2012 (r237999) +++ head/sys/vm/uma_core.c Mon Jul 2 16:14:52 2012 (r238000) @@ -3381,6 +3381,8 @@ DB_SHOW_COMMAND(uma, db_show_uma) (uintmax_t)kz->uk_size, (intmax_t)(allocs - frees), cachefree, (uintmax_t)allocs, sleeps); + if (db_pager_quit) + return; } } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207021614.q62GEqdj080544>