From nobody Thu Feb 16 04:53:52 2023 X-Original-To: dev-commits-src-branches@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 4PHMzN3PFxz3s4th; Thu, 16 Feb 2023 04:53:52 +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 4PHMzN2jQYz4TCd; Thu, 16 Feb 2023 04:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676523232; 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=NxADzpCZAo3LN4LLYmpLi3GOQnum83ter1aU0PimoEw=; b=aqUtUbPsVIOu91w6cAV6pTR1MyiI5nGNVz2W282nMtq+Z4+l9uzUX+WAjqmeBqXx2/C7aj jyRM+b1zfgMP8kagllVni0T0hAmsjKSVUH5m2Y4v8qnbF/grgt3S8oUjEx3OeNY41bbLDb VQORt+Wk9a8IUDvSmOvRnziNaADgMebjK7aNM2mAXUu83sEXduRGA82B6Z342QLhpPAOb/ jwm+U+Web3CC9r+qSq6yd3vmiJJ4/6kRC9q9kUk0RQjCYYT6ohnuqVyXFp9buoX5EdhIKF g/eqe+HXVxiTDPEZ8dXjOPsCKgWkRG7qn7eoRjnCgiBOGGON/QZHAhjUjy7i7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676523232; 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=NxADzpCZAo3LN4LLYmpLi3GOQnum83ter1aU0PimoEw=; b=c6/B6u1G1N5pceWMUzqpD8w0N1LxZozjowiLfSxR+TXRg0vmwBv8zExiQPr3SIv9sZ2xQ0 Le9YE3w2ZAd1JXMCyq+BMS+2suGjMKhdsr+dwwiKFbTxynk7LeGCgEIAhBlSW20ymAbVUu dX6KV4CUAD7a/sR2Z+5vTVwzyR8IVfel8Iu2GsDW4ZCoR/FWeBir2zAgzwLwO99ia9Z9bY yMeAafsjfd+XEUj5Qv4yBxaqtBJ4YpHJNJSAGs3LpmJ2tHfKmez5SHQYEOEtfC8CDMU9hn m99jYbIAM1a/MKCtb4c/N2WECWngUFkimWgcwFzg+f8ZHlTyQcyKNxzwzXk1Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676523232; a=rsa-sha256; cv=none; b=R6utZSVL51JS1FYbJUS2P85pAnLOKEgpPP+ouYt1LirTo289ajbQ/DXgrjHZLtJ70KCrN7 3bEHBc0n12TU/JNZ4BWeh4v9tFPafGP2QSusuVSyuyzQLGzQBMIGit1Bn2iTBZ5Ln9b0UN M+h50xahZD9SqMP8odN4+N9CxGU8EOQVxVA3f6vpimZ+bgGnp3TBJJ1mMCL2HvgU9mWlXk 3Q00+hEoDfnMUtNSpAhUWyYbfH1py7qp6LL8xShKHoTWLXBArFjCo3Q30uB4mZ+/MXbKsI 06Ra/JHo4++SlfceDRcq86Cojtkt+lJn46e8MDaijkwQQBN7KtIdcSg8Vl1eGA== 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 4PHMzN1dhvzrvW; Thu, 16 Feb 2023 04:53:52 +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 31G4rqq1057175; Thu, 16 Feb 2023 04:53:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31G4rq09057174; Thu, 16 Feb 2023 04:53:52 GMT (envelope-from git) Date: Thu, 16 Feb 2023 04:53:52 GMT Message-Id: <202302160453.31G4rq09057174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: b7a3f47bffd2 - releng/13.2 - top: fix sorting by pid (-o pid) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: b7a3f47bffd2f15d4b0d2cc3a36852bed6960595 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b7a3f47bffd2f15d4b0d2cc3a36852bed6960595 commit b7a3f47bffd2f15d4b0d2cc3a36852bed6960595 Author: Kyle Evans AuthorDate: 2023-02-13 06:39:04 +0000 Commit: Kyle Evans CommitDate: 2023-02-16 04:53:44 +0000 top: fix sorting by pid (-o pid) The 'pid' order was added, but the equivalent comparator was not back in 8b800d3af2d8c ("Add the PID column to the list of sort keys."). `ordernames` indices need to match `compares` indices in order for this to work. A future commit will restructure all of this to make it less error prone going forward (see D37083). Reviewed by: pstef (D37083) Approved by: re (cperciva) (cherry picked from commit deb63adf945d446ed91a9d84124c71f15ae571d1) (cherry picked from commit cfd3bd04c245889d339c4f7cb1e45c955537e3eb) --- usr.bin/top/machine.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index 315c8be1a4c2..be667ec0e461 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -1567,6 +1567,7 @@ int (*compares[])(const void *arg1, const void *arg2) = { compare_ivcsw, compare_jid, compare_swap, + compare_pid, NULL };