From nobody Mon Feb 13 06:44:36 2023 X-Original-To: dev-commits-src-main@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 4PFZZX5P78z3rFCR; Mon, 13 Feb 2023 06:44:36 +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 4PFZZX4Ntrz4JkW; Mon, 13 Feb 2023 06:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676270676; 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=OYdVzfSlfcBsE1qi4FZjHPIEHWxeLVW7R248l7h7noE=; b=A/ymn079PMO9Qdar4OGj/dtVkS0CdYRDI8WbPuvttPYTFJypEW/bF6NdhZNqGEfmFGCqNV JrA9YEMHixDAbeokYGVKY/xJx6f9s3k4pFFlyOAAh+s0pX5riiT9OBaMomkTmo5GI1U6Yk u4Pg3sAFh5tuzXsoa3p3DMyDArtg0ss0MDGJ4HQyhIfsCnFain3PaVeXlDn+EzWuh0aNEP s5o2jcvX9vLskxNMgvFmUpmKR0eUa2XX7FXBcjg8K/Edqkcs1IrhXwhlCJgsu8ktbaWEuq ODzK0KwotfBeM4ZPlMAWg1sw1M2a5j9LH3pMUe2AX77Ul+/0tFyj5Gg4UfNiPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676270676; 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=OYdVzfSlfcBsE1qi4FZjHPIEHWxeLVW7R248l7h7noE=; b=Y+aE0mt/yCjqypQu+tE3NxcAheiFP/gUoPSaP6zkhd45q+w4r5/OTkvVnM5AYzZwcPPbCF fG0VABU5xEPzfyYyOMcVzXzoAYwX6kwSQ2ytDLPcj/NduqiA6L9pDcMPF7RETsmfVmAmuo R7vbqKuz84xE+NCd69iftCaiYvwtOdt5o0R841AWnZoYYT/Z6AmU1XMRO15ieAyYwq7gs6 UcOEOhwLcTYjJB3WJqqH2MrifMWHXQ7CPw210ciQp+a1m1GyLQlRP2ts3CuQ0NNEszUIg6 7zy1GhyzekddJFQ2PI7pvfyUKknAccIKom5JinX9aLDJLoR5YfVMOCzfdr9WQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676270676; a=rsa-sha256; cv=none; b=QaTTPg3UAOsw0vt9xor30N/JVw5TL4h1PCqqIxih4ulY0DchZXt5dGsbiBi+UV9Jy2WmgZ Lnah8OFPhAhiqPaVQYWf9/6nRWu97L7ZQTCUhl851JJN/F38PaWA7wMeoyCohwTHfZp64q WQU5AxtHWdaLZcem11GmTp5ACoigcV8GHQ9as/lzaU/uLqJpbN4Cl2OEvvvutPZmPRn02v C6LZhW9lWyWXVqOjWMB22bwChnPgji5OJN1dnFtgM4XX9WG1AB3v9bxNR0SrH2uBVxTOv8 B0zlddvsd/oQNNniEUZUFRn9iCi7nwP4pCmeMbaQGb3KClMGtJyvASxSgnCLzw== 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 4PFZZX3R71z17Qt; Mon, 13 Feb 2023 06:44:36 +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 31D6ia9w024610; Mon, 13 Feb 2023 06:44:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31D6iaO5024609; Mon, 13 Feb 2023 06:44:36 GMT (envelope-from git) Date: Mon, 13 Feb 2023 06:44:36 GMT Message-Id: <202302130644.31D6iaO5024609@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: deb63adf945d - main - top: fix sorting by pid (-o pid) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: deb63adf945d446ed91a9d84124c71f15ae571d1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=deb63adf945d446ed91a9d84124c71f15ae571d1 commit deb63adf945d446ed91a9d84124c71f15ae571d1 Author: Kyle Evans AuthorDate: 2023-02-13 06:39:04 +0000 Commit: Kyle Evans CommitDate: 2023-02-13 06:43:32 +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) --- 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 };