From nobody Wed Dec 29 19:37:17 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7CD741918B99; Wed, 29 Dec 2021 19:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JPM9n6bgyz50MD; Wed, 29 Dec 2021 19:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BA52D2A87; Wed, 29 Dec 2021 19:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BTJbHq6008286; Wed, 29 Dec 2021 19:37:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BTJbHd5008285; Wed, 29 Dec 2021 19:37:17 GMT (envelope-from git) Date: Wed, 29 Dec 2021 19:37:17 GMT Message-Id: <202112291937.1BTJbHd5008285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: bd7e18a378fa - stable/13 - Eliminate key press requirement "show vmopag" command output. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bd7e18a378fa0eb919b9ccfcc490c3ff6f7f9cb5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640806638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FQxWUrDgxR5V7GcCf5ZHVuzPCRFUpiuXde504x4Y8QU=; b=BfQE15yxBzpUVyqEgFGqubIEzdqMT7hq23faXq03FisFSeUK8wuWmW1006g9eG2Z2L4d3M Kz+kJ/0u06BiZ1ZCPW2brleqSWJ+xr88EQYuZYTMflfD90YxwvyyCzAnRAVRxrBx9jYalI 7iYuVkTFibzElUxVb+aMZC4uiF0AMIXyaL2rrag74jxPAJJ+og6OoXvzRD0YmqNLQJIWwU FJj+9C8ITO1NInVhDOZ8iohg1iyoV5nAyKqua6TIfpFF3R5k6pkz9Ac4mSihDKXe1l4bhC ZJyJXRNNu3ykkpZBsR71p+BbwhuCTTLtcNPQ4+Wuoy3ismlwzAHVTu0e8oAEmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640806638; a=rsa-sha256; cv=none; b=GxMA+MUSbqQNLGD5dnGhjBgg5/dc7tPdUWGAjCExYnj0JgCV4qQDBlydmAVF4AwkOBG+3K dYERkpAV7CYQoRjpkpiaeXP0rPF6XMvM1lJ7E5GrV9tbMIGOW7SEh0OjdsbrqXVId52HMd Rykukr/S0caZni5Z+Zxe/VI4hFrfyFj8QLXP3HVumvcRotBFToYNrKDdJlS53bovsLXF5H BBcxu0Uz7fSuOcj/5r5Si5rVuVtheaErxWBDAeDu2Dx4XUg6nBFwwvLEpIzk0AWC4fWfRh ZsBdWAMQ8jSwQ7G9YSwweApKGpqIXuT8pQ2rarmVzAZJzCgCpESNgOzVrU1MzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=bd7e18a378fa0eb919b9ccfcc490c3ff6f7f9cb5 commit bd7e18a378fa0eb919b9ccfcc490c3ff6f7f9cb5 Author: Stephen J. Kiernan AuthorDate: 2021-12-17 21:39:51 +0000 Commit: Stephen J. Kiernan CommitDate: 2021-12-29 19:32:48 +0000 Eliminate key press requirement "show vmopag" command output. Summary: One was required to press a key to continue after every 18 lines of output. This requirement had been in the "show vmopag" command since it was introduced, which was many years before paging was added to DDB. With paging, this explict key check is no longer necessary. Obtained from: Juniper Networks, Inc. MFC after: 1 week Test Plan: Run "show vmopag" from db> prompt and see that it does not need additional keypresses other than the ones needed for the pager. Subscribers: imp, #contributor_reviews_base Differential Revision: https://reviews.freebsd.org/D33550 (cherry picked from commit 18048b6e3cb647f2a18e1e51df1cf86a90fc6802) --- sys/vm/vm_object.c | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index c465a2cf76dd..cc4463567aae 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2815,18 +2815,13 @@ DB_SHOW_COMMAND(vmopag, vm_object_print_pages) vm_pindex_t fidx; vm_paddr_t pa; vm_page_t m, prev_m; - int rcount, nl, c; + int rcount; - nl = 0; TAILQ_FOREACH(object, &vm_object_list, object_list) { db_printf("new object: %p\n", (void *)object); - if (nl > 18) { - c = cngetc(); - if (c != ' ') - return; - nl = 0; - } - nl++; + if (db_pager_quit) + return; + rcount = 0; fidx = 0; pa = -1; @@ -2838,13 +2833,8 @@ DB_SHOW_COMMAND(vmopag, vm_object_print_pages) if (rcount) { db_printf(" index(%ld)run(%d)pa(0x%lx)\n", (long)fidx, rcount, (long)pa); - if (nl > 18) { - c = cngetc(); - if (c != ' ') - return; - nl = 0; - } - nl++; + if (db_pager_quit) + return; rcount = 0; } } @@ -2856,13 +2846,8 @@ DB_SHOW_COMMAND(vmopag, vm_object_print_pages) if (rcount) { db_printf(" index(%ld)run(%d)pa(0x%lx)\n", (long)fidx, rcount, (long)pa); - if (nl > 18) { - c = cngetc(); - if (c != ' ') - return; - nl = 0; - } - nl++; + if (db_pager_quit) + return; } fidx = m->pindex; pa = VM_PAGE_TO_PHYS(m); @@ -2871,13 +2856,8 @@ DB_SHOW_COMMAND(vmopag, vm_object_print_pages) if (rcount) { db_printf(" index(%ld)run(%d)pa(0x%lx)\n", (long)fidx, rcount, (long)pa); - if (nl > 18) { - c = cngetc(); - if (c != ' ') - return; - nl = 0; - } - nl++; + if (db_pager_quit) + return; } } }