From nobody Thu Feb 16 03:34:52 2023 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 4PHLDF1Tcmz3s0XG; Thu, 16 Feb 2023 03:34:53 +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 4PHLDF139gz4MVw; Thu, 16 Feb 2023 03:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676518493; 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=2waxgtH8ieNf4+au429hF59VGYzrBxex/S6z5Cd2SGs=; b=UnzK4UZfUWBEBRZQFWRCtpv55rxbdJy7rMmhD4eY+bVmUDbXdTP8q/3c0tatOHMwZlYC+B PYComVf/ci90Q0qCoW1fwAML0VsPPACSnFqupkxsV0lFOATJW1w09yfLWTZ+LvYTUESm3A S6Pf/n/0EbHt68jTxMCLRlrIgUK5w9WOj48Ui0/nz1atatdjlb7men25ptxJyCVkkUFaoM 4FyP+FaRTdQwsov9qKoi8cxhgaJNfZK+uWcMtfgT3wMylRmu2MxLT4B+m2mx/1fyN7KVFG dz/2T97x45iye7f37KUvFOpTgF5GGUmNrF1UDrQfE1JTrzn24F/9E05Etx+6HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676518493; 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=2waxgtH8ieNf4+au429hF59VGYzrBxex/S6z5Cd2SGs=; b=Gljof/BvXsE7dHwGKV+2O/ROhHAi+y+pqqav3ciWLuUPPSHQ9RVC3OL81ZncLc7Qv8n+5V hLDOKIso+LBXHjlLV9P9qEiK7kV++CfQ5K2bGj5q7ub0L84FMn9xN2HN7vz4ZUZqX1yFZT BIRMoWKeL+GFhM82nAXuwGv6n6wYjMBPd9NChDT3XZgEvOrlRT10CRyFULnQf7jODdZZXk alWfD13rU/cT3IruJ9/mAD5CopiqM68V4CpnBwb/IUcLhuJsA9FDgDrmJeZYzMJieefNdx yXie6MbuZizZBDCI8ep5UIGQRpp7lsidHrhJXTvmGf2tdo2CAyUF+EkPh3x8Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676518493; a=rsa-sha256; cv=none; b=dp8QA6mYG31UveyI7Lhdyp96w/bUtSkxQyOYuKjbDQEzrcE99yCAQQojfnlVTCPf/i9MUg yExbQDptUAV0WBamZK9vBZ3sFMSq1K3ioZZLoG3GpwR0Agv9autIOYHsd7iFjFR07jhPmE EnVKE8jK0q+qUYZRD2aG9cPYvZM/wJULe+szskPmCOd3cJ2Sze4i0ODSSuZRXgiYBeQccR dPLyDhrKTXAk4XOgPZ+X92n5NYcqsaIwf2jJsRmxJ2mJpZQr16lRYyaTv3iPKJyGUNmlGw zTD4+2nQrZBDDxYKtlt4rsbV1rOU0Hq+5AzfIIS2ATt09yB/iW31edjA0X6EpQ== 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 4PHLDF07GpzpbB; Thu, 16 Feb 2023 03:34:53 +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 31G3Yqcm043053; Thu, 16 Feb 2023 03:34:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31G3Yq15043052; Thu, 16 Feb 2023 03:34:52 GMT (envelope-from git) Date: Thu, 16 Feb 2023 03:34:52 GMT Message-Id: <202302160334.31G3Yq15043052@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: cfd3bd04c245 - stable/13 - top: fix sorting by pid (-o pid) 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cfd3bd04c245889d339c4f7cb1e45c955537e3eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=cfd3bd04c245889d339c4f7cb1e45c955537e3eb commit cfd3bd04c245889d339c4f7cb1e45c955537e3eb Author: Kyle Evans AuthorDate: 2023-02-13 06:39:04 +0000 Commit: Kyle Evans CommitDate: 2023-02-16 03:29:54 +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) (cherry picked from commit deb63adf945d446ed91a9d84124c71f15ae571d1) --- 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 };