From nobody Thu Feb 16 04:58:15 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 4PHN4S08fGz3s4y8; Thu, 16 Feb 2023 04:58:16 +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 4PHN4R2ySKz4Vf2; Thu, 16 Feb 2023 04:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676523495; 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=5HdHs3vQEl5iU1ddya2IwIOuEvdsY1esqKOcxskbq5I=; b=u8+pPIvTeamnCNyqiZkGykhvP2GwmrTIbnE/k8Wcw6nJnnTc0CEMoQ9QIJXwUvAlFZb92Q f6ewL/M6XqiMWgLvutaTGtND2QohvK8Ebwjr5A2i/s2D+XtzxCusoNcSJ9Wn12oVDWdPG5 skzTzLwaKn65SqCioUbHhC5asaoHGf7czhhlvm/6YWS4CPujFxb0XV0E7HXaai6Fw3XCim D9M5Vj4KUPXcP5+4kL7QPSt9/nOM0yh6wnVbrv/2tdrGcNHo0cij1CnWHKilaRD9Hchx09 //nb6uf1Yi1asRI5g58EhLeAIxWJ5wafsM+6dyLPGb7p/zDHMsl3waE8OhDjQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676523495; 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=5HdHs3vQEl5iU1ddya2IwIOuEvdsY1esqKOcxskbq5I=; b=EkPD8rOdNwo/7qiKP+c7Ou2XJXJIYCgfHaUnIyAmlc50jKUHzLS21sJ14CkkRWTXHJWjTM wSg5FLY+cTyt46WUmWuJ/cJDvCAL5mdS53ry2OmJ4iI+wYb2K4VXRPzM8FokC8qHxrJvQA 1fBqAUMEKJ6ImOkZqcpRP0h7vr+VG2ICiq9lK9lm/aeBOXz4Fhxs2R0yW/M6+fHeYR4Ecj +nXX0w29PpSwlvplQLHB/IDLRkMsT1QLcRizzgm+4Azw6EBFbot5IqDU0/ebEJCf26yBRo oPBp1mizz7TfUmfu6e/uRsg6yE+BfxPtjmVDtHnDqi/iUn0te0v28euoZO3zfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676523495; a=rsa-sha256; cv=none; b=vZQzi8lopJUjyLN3tbqrMYj0pKnplnZQaA++nbW11vMWJOmiqExAAaX9fE/ybHmgimWJk1 3MM3zEGktCjvVYiza0kDTtgoDGFt1gF8QDyX1vVIIzRR3t0r9n6PFwYoC1Zc1pO8L6Yx7B wTuZtdkQUUkfquE94IKFjTr85Cz2CmuKXOfuHDCHzdjwazfhKOJZPqXMZqCI5c3YBmXnkI HvXLUH1Ui2ZcoVZw9J96HwIx9er0IMH6u98inTuLvozA/K8txDb4o8Mgp4goqD+pX8vb24 ghS1DHplga/uY7bP+ciqi2S4qHzPZVJV5VFJ7cQRzQRNt0Kee19J/yJK1fgqbQ== 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 4PHN4R21WBzrkF; Thu, 16 Feb 2023 04:58:15 +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 31G4wFvo057839; Thu, 16 Feb 2023 04:58:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31G4wFWm057838; Thu, 16 Feb 2023 04:58:15 GMT (envelope-from git) Date: Thu, 16 Feb 2023 04:58:15 GMT Message-Id: <202302160458.31G4wFWm057838@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: 6431b5ab6bba - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 6431b5ab6bba2dbf7a22c00e6a3ce2afd1bde436 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6431b5ab6bba2dbf7a22c00e6a3ce2afd1bde436 commit 6431b5ab6bba2dbf7a22c00e6a3ce2afd1bde436 Author: Kyle Evans AuthorDate: 2023-02-13 06:39:04 +0000 Commit: Kyle Evans CommitDate: 2023-02-16 04:57: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). MFC after: 3 days 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 6116a06bb28b..d41b3e4f6b74 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -1552,6 +1552,7 @@ int (*compares[])(const void *arg1, const void *arg2) = { compare_ivcsw, compare_jid, compare_swap, + compare_pid, NULL };