From nobody Wed Jun 18 02:13:36 2025 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 4bMS2n3Cwyz5q71h; Wed, 18 Jun 2025 02:13:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bMS2n11M7z41yM; Wed, 18 Jun 2025 02:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750212817; 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=y6IoUYL6XG6sY7S0OomlJm6NgEnplLQiaJKClCboV+o=; b=oy3m/87sWM/W3H5ZijaZ0WPNUZUNhTVY7NY7ZF+bKOTlOyl6u/KYW3RdhuTk1zgf+ieT9O ATDZHFO9LGl7ED0nj7WARoJNXExwkG7aHkWXoi80hyu3AXIQ2exOayvjV39MOTQqLkWo72 jICJ1hs7+Nqv6sFzptrv2Tx8/HQ2rsjYh25o2mOUbTeucP/dDAcmQEGoPqYt8odH+2tAwy Hl9fK4U6b2SrLStbLt6uJM+djxIM2skprEbWuhoJZrij+/6ahue+7vdo0mElT0aYISGBV3 VEBL12ES1l2nNGvSd8Q4yIgY77HdvoykpLcPGtw3g8lfUe8jS8nkDaN5F6fQDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750212817; 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=y6IoUYL6XG6sY7S0OomlJm6NgEnplLQiaJKClCboV+o=; b=FNCcjjN+yVe7OE2ao/tQ0ce0XyhLK07n9jyd8Ao6cYyKKEIdRbgGO1BuImD+jpC9qpbvI4 aTtEufTnSnwbHib6zUZvvw3+W8v762//V4vyTwYpvV7d2T/VTm/FzVnNMT3KXddnqwhSht NDHUPLM8sodPYYQe4cdZ2bUqEH+gPqcpKYdInghvyNj8Q15aK2hbFGbk6tMkQhnVtuPAkd v4UKdDHU+cSYHSbDf3rbcZBjPW8QUKcvczVTnD0Mv65Dac1MC14Jy3hMZGciyGwgwjgLFI HPeXa4ZRt/DIBcqRsBQLOOGbbpH6HBtrDsWrcvzf6qxylCunVm2xMYzYm8daTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750212817; a=rsa-sha256; cv=none; b=UvKTw1PmWK9qAxZOfWCbzZWjzPh5LlgpJbXv86joq9SUYsL9hSvuDHkshA13hQQeRt+2Tw qHO7BDaJaNbhYVOahh/9MHY/c5c02hVGWDmpADbQDD+eSa6CuxrjufOewOvu0iQS64nE0U oZaTINgYdqVeyTTFJAo8y3DtesGr/xoxL5qLPkrI9cddRrl21fEq5QlUrHz8iZcPCWGhZi oEtiWGHeQGubFt06OgLuJwJjP2EwgAEn6PrXUEyOo6j2jT1uvP8bHod+BzSwlU6yi4cFaj i+s4FXXK/BUAguRRKW+Bv/stxIRSfhpbdcynwekJuIiF9Fzi+1Vptx6SjReliw== 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 4bMS2n0PbTz18YG; Wed, 18 Jun 2025 02:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55I2DaAD024833; Wed, 18 Jun 2025 02:13:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55I2DaS5024830; Wed, 18 Jun 2025 02:13:36 GMT (envelope-from git) Date: Wed, 18 Jun 2025 02:13:36 GMT Message-Id: <202506180213.55I2DaS5024830@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: a454ff6b0440 - main - sched_4bsd: Move ESTCPULIM() after its macro dependencies 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a454ff6b0440ec1a8e6b5c8154ad22c32df13c51 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a454ff6b0440ec1a8e6b5c8154ad22c32df13c51 commit a454ff6b0440ec1a8e6b5c8154ad22c32df13c51 Author: Olivier Certner AuthorDate: 2024-05-21 11:59:40 +0000 Commit: Olivier Certner CommitDate: 2025-06-18 02:09:38 +0000 sched_4bsd: Move ESTCPULIM() after its macro dependencies No functional change (intended). Also makes the comment about INVERSE_ESTCPU_WEIGHT() adjacent to its definition. MFC after: 1 month Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45392 --- sys/kern/sched_4bsd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index d15f5d68fbec..c7b55e6ca07a 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -73,15 +73,15 @@ dtrace_vtime_switch_func_t dtrace_vtime_switch_func; * INVERSE_ESTCPU_WEIGHT is only suitable for statclock() frequencies in * the range 100-256 Hz (approximately). */ -#define ESTCPULIM(e) \ - min((e), INVERSE_ESTCPU_WEIGHT * (NICE_WEIGHT * (PRIO_MAX - PRIO_MIN) - \ - RQ_PPQ) + INVERSE_ESTCPU_WEIGHT - 1) #ifdef SMP #define INVERSE_ESTCPU_WEIGHT (8 * smp_cpus) #else #define INVERSE_ESTCPU_WEIGHT 8 /* 1 / (priorities per estcpu level). */ #endif #define NICE_WEIGHT 1 /* Priorities per nice level. */ +#define ESTCPULIM(e) \ + min((e), INVERSE_ESTCPU_WEIGHT * (NICE_WEIGHT * (PRIO_MAX - PRIO_MIN) - \ + RQ_PPQ) + INVERSE_ESTCPU_WEIGHT - 1) #define TS_NAME_LEN (MAXCOMLEN + sizeof(" td ") + sizeof(__XSTRING(UINT_MAX)))