From nobody Mon Jul 14 00:29:07 2025 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 4bgNVC6rfFz61hXK; Mon, 14 Jul 2025 00:29:07 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgNVC3NPpz3s0l; Mon, 14 Jul 2025 00:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752452947; 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=7fUnhZAWzjaA4FdGkzeZFiZ6k/yKje6BvXedS0OTQKY=; b=pbh3r3SdgFJ+a6qPAZ+V1fCq3YYzex0rruyPJoAsdZQrZTBWRpDHe4x9kETpRBVxuoAAPL myFLzdxcrJsfW2X7zwzPW6UzpCoAz3p7x5n/0JXn43+jB5/6ydCDhJZYINOF89S/Vwcoji PzfGlFSbkpm0WBj/B+iUS/cCxoe7hPXKHRrdkThOkMS69KpeFDarP6z0vIOEUiI1TpYcUC 56rB8eTRve2Azk8sIIKMdem+Wa45q+10FNLVyW/30UK34rYKWUBqMi5907a4vluUzi5F7z eFyVg+yqI7r1JvxvSs5I8xZPQfvaoCPDWOcSLZkPETnDDRuh0U0rs6Zhab3TGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752452947; 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=7fUnhZAWzjaA4FdGkzeZFiZ6k/yKje6BvXedS0OTQKY=; b=eVWG5GfeKl2MMJu9FA5zOvpONyHhe1ngQXJzvOXSOo1BllkbP/yjK/L1opmwV7K9tBZq46 2P4fGwgFq9zjiBYMydCS+uMAuZWtwohO5b++FqkeIZBuujWpRQXciSVbljhZPcwXOS2Bez spINOObYkSAJM2zE3vOys4bsyGomYcbZ1ENrc5OaBXMHaImuyS7H8M9KorlpIrLat07HXt Anf4jUEpsOvhJ/xJpLBMWVhk10z6F1p37ggz0XouEV7q3QLcl67n6kLM36CBK2Nn5O8BYk kKz/iw1z9X1fWjBzJ8pyokpA5+BN6ELt+EoZosysH0wJU1U7ldcRoud81OnZcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752452947; a=rsa-sha256; cv=none; b=MvqXsvqqvlV5KQ1SA2w8220zu3ZMM5tqNG0Iq5uiKSUkeQcyg8Lo4gq49kBhhcADzrqZAp BEqd5nQovcHeBVrypgvJFgsObtKn2KzFyL7yp7ukkf8I8hL+C8c4qA0UpvCdSqWE5Y2UCc InwPkDZn44pGrxl1GHWQMI2QJMVk/VDGD41sYELDANqXLztrCYNU5MLiSVSHePKWbZwd+U DB67gwBi5ynRd6qi1oLRy5IyFe5X8VYNAfo+kYcXAyaddxdNwQ2+I7i2cRd4m3csEv+Pm7 V/fPNYVA1hCL4uFzmRv5InLSPOKJ1in54HdnBqyw9Z1bbOb4m3qh8y5DC9jOsw== 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 4bgNVC2r4ZzXKQ; Mon, 14 Jul 2025 00:29:07 +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 56E0T7Us022904; Mon, 14 Jul 2025 00:29:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56E0T7GY022901; Mon, 14 Jul 2025 00:29:07 GMT (envelope-from git) Date: Mon, 14 Jul 2025 00:29:07 GMT Message-Id: <202507140029.56E0T7GY022901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: b87aa791533f - main - amd64 pmap: simplify recent changes to pmap_enter_pde() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b87aa791533fd3fc8096faa837264761ed7f4a8c Auto-Submitted: auto-generated The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=b87aa791533fd3fc8096faa837264761ed7f4a8c commit b87aa791533fd3fc8096faa837264761ed7f4a8c Author: Alan Cox AuthorDate: 2025-07-07 20:29:40 +0000 Commit: Alan Cox CommitDate: 2025-07-14 00:23:49 +0000 amd64 pmap: simplify recent changes to pmap_enter_pde() When pmap_enter_pde() removes an existing 2MB page mapping within the kernel address space, do not remap the kernel page table page since it will shortly be unmapped. Simply zero it. Eliminate an unnecessary conditional refcount decrement on what must be a kernel page table page. (We only utilize this refcount on user-space page table pages.) Convert an assertion from a panic to a KASSERT. Reviewed by: kib, markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51235 --- sys/amd64/amd64/pmap.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index fd02d1ad6690..c3e3a91b20ec 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -1336,7 +1336,7 @@ static pdp_entry_t *pmap_pti_pdpe(vm_offset_t va); static pd_entry_t *pmap_pti_pde(vm_offset_t va); static void pmap_pti_wire_pte(void *pte); static int pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva, - bool remove_pt, struct spglist *free, struct rwlock **lockp); + bool demote_kpde, struct spglist *free, struct rwlock **lockp); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva, pd_entry_t ptepde, struct spglist *free, struct rwlock **lockp); static vm_page_t pmap_remove_pt_page(pmap_t pmap, vm_offset_t va); @@ -6165,8 +6165,7 @@ pmap_demote_pde_mpte(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, * pmap_remove_kernel_pde: Remove a kernel superpage mapping. */ static void -pmap_remove_kernel_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, - bool remove_pt) +pmap_remove_kernel_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va) { pd_entry_t newpde; vm_paddr_t mptepa; @@ -6174,12 +6173,8 @@ pmap_remove_kernel_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, KASSERT(pmap == kernel_pmap, ("pmap %p is not kernel_pmap", pmap)); PMAP_LOCK_ASSERT(pmap, MA_OWNED); - if (remove_pt) - mpte = pmap_remove_pt_page(pmap, va); - else - mpte = vm_radix_lookup(&pmap->pm_root, pmap_pde_pindex(va)); - if (mpte == NULL) - panic("pmap_remove_kernel_pde: Missing pt page."); + mpte = pmap_remove_pt_page(pmap, va); + KASSERT(mpte != NULL, ("pmap_remove_kernel_pde: missing pt page")); mptepa = VM_PAGE_TO_PHYS(mpte); newpde = mptepa | X86_PG_M | X86_PG_A | X86_PG_RW | X86_PG_V; @@ -6209,7 +6204,7 @@ pmap_remove_kernel_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, * pmap_remove_pde: do the things to unmap a superpage in a process */ static int -pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva, bool remove_pt, +pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva, bool demote_kpde, struct spglist *free, struct rwlock **lockp) { struct md_page *pvh; @@ -6249,9 +6244,7 @@ pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva, bool remove_pt, pmap_delayed_invl_page(m); } } - if (pmap == kernel_pmap) { - pmap_remove_kernel_pde(pmap, pdq, sva, remove_pt); - } else { + if (pmap != kernel_pmap) { mpte = pmap_remove_pt_page(pmap, sva); if (mpte != NULL) { KASSERT(vm_page_any_valid(mpte), @@ -6262,6 +6255,14 @@ pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva, bool remove_pt, mpte->ref_count = 0; pmap_add_delayed_free_list(mpte, free, false); } + } else if (demote_kpde) { + pmap_remove_kernel_pde(pmap, pdq, sva); + } else { + mpte = vm_radix_lookup(&pmap->pm_root, pmap_pde_pindex(sva)); + if (vm_page_any_valid(mpte)) { + mpte->valid = 0; + pmap_zero_page(mpte); + } } return (pmap_unuse_pt(pmap, sva, *pmap_pdpe(pmap, sva), free)); } @@ -7573,8 +7574,8 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t newpde, u_int flags, * the mapping is not from kernel_pmap, then * a reserved PT page could be freed. */ - (void)pmap_remove_pde(pmap, pde, va, - pmap != kernel_pmap, &free, lockp); + (void)pmap_remove_pde(pmap, pde, va, false, &free, + lockp); if ((oldpde & PG_G) == 0) pmap_invalidate_pde_page(pmap, va, oldpde); } else { @@ -7584,10 +7585,9 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t newpde, u_int flags, * before any changes to mappings are * made. Abort on failure. */ - mt = PHYS_TO_VM_PAGE(*pde & PG_FRAME); - if (pmap_insert_pt_page(pmap, mt, false, false)) { - if (pdpg != NULL) - pdpg->ref_count--; + mt = PHYS_TO_VM_PAGE(oldpde & PG_FRAME); + if (pmap_insert_pt_page(pmap, mt, false, + false)) { CTR1(KTR_PMAP, "pmap_enter_pde: cannot ins kern ptp va %#lx", va); From nobody Mon Jul 14 08:04:35 2025 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 4bgZbl4RVZz60gLK; Mon, 14 Jul 2025 08:04:35 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgZbl3lKbz3Tcm; Mon, 14 Jul 2025 08:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752480275; 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=rzR5Prde2Jsd8rvqcR10qi5UAONWYXn6VbT2/6I4Gbw=; b=PaJav/d90ACUhmv8GCgqz3JyydrSz/jyt9hRaW4CQJrAabkQg3ugXuBDxDpz0sxGDJhYZL FpR0rbO7ipedhsMhQBcNwSZxvEiSHTS5nSOeCXiHcEH0ID8fClByn53pOcRaCFYfXaIocr HNjFa1VDog30PMKiWV0pJ9Atfh+tvKyT2sy/NaBjyFMEBmU41Q136yK9Q8igfN5427g01f AELqtfXquh3WsuRe8RzpCvn23it9S6m6PkwFYoCrPjyGC6heL7FXVqru1s2odhyA5r5WkS fxImnTmpbX7ajHgYWlY0ftwqFEvLW13X0l7GbJq4lDpT191hZGkyDiw/Pmoayw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752480275; 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=rzR5Prde2Jsd8rvqcR10qi5UAONWYXn6VbT2/6I4Gbw=; b=THS2sEI3KjJ0uxaTfju3di49yamwqqfDy/OuKBAxW1NDXoBewkF9n9/TEoXTJ2x2Zd/o/D vL/UAawkDFPGYYdAY/Y/sAx+y4WlCR6l6sh5wbUc6kCMihTSCC6Oj2ZZ/Axi89HoVigfDS /hja+xXh6tlVjmHGwMnrXqB9EacU4HFuB3We9xRJ3HG8LujgYLGK8TFRk1y25poym7Hbq5 k0eOoi0T5Lq3o+yQxDOg1v9uPUxNA2njTafGGtwEU48JaKqk/CyyJD7Q/PN+vweEPaFDcC Dnci20vgfaIv5Jhn+NFNMKvMo/4BTnJyr0S5LvpP2+F+JsxzlV1WLQO9d/4f1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752480275; a=rsa-sha256; cv=none; b=Lqm1D7DSt0RJmwkGJtdOR1Sy/Bg3G4YrFfFQKawaWebIUTkPYXQzyCZ/KiTUk9Hbp0fZOj ZTso7fPC/GJ9VX3vTkxfyfIM+/Yjj+L+vA0fqZyAlT1qDwj/4htK7LbZRbovXk4cNn/oD+ TZPL8rPtMsFaAoVaisbb79+wrEvdbgC0cDZ9TmiB08dLcs8yGYM3+4IO3XU6Pvvz4hFP0e 6vjlbK6/na52BPcyPxqBO7ZZW/W38yiLEk5xMoXIUvOuYWx0FdwoDvMvvVbWA08TWF2iy+ /ZLH8LBdHk5KhAQA4SXSZ0oACTfxXZtwjsC7IhGpX0nJRbbqFiFjHmV9v1w1Tg== 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 4bgZbl3HGbzlHl; Mon, 14 Jul 2025 08:04:35 +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 56E84Zxs086030; Mon, 14 Jul 2025 08:04:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56E84ZCr086027; Mon, 14 Jul 2025 08:04:35 GMT (envelope-from git) Date: Mon, 14 Jul 2025 08:04:35 GMT Message-Id: <202507140804.56E84ZCr086027@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 4d718f57c58e - main - xhci pci: Add some amd xhci controller device ids 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d718f57c58e4f3431b8dee4eda77eb7c54cd1d2 Auto-Submitted: auto-generated The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=4d718f57c58e4f3431b8dee4eda77eb7c54cd1d2 commit 4d718f57c58e4f3431b8dee4eda77eb7c54cd1d2 Author: Tom Jones AuthorDate: 2025-07-14 07:59:32 +0000 Commit: Tom Jones CommitDate: 2025-07-14 08:03:45 +0000 xhci pci: Add some amd xhci controller device ids Reviewed by: aokblast Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51259 --- sys/dev/usb/controller/xhci_pci.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index b50e33ea36ce..d5cfd228a429 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -99,6 +99,11 @@ xhci_pci_match(device_t self) return ("AMD Starship USB 3.0 controller"); case 0x149c1022: return ("AMD Matisse USB 3.0 controller"); + case 0x15b61022: + case 0x15b71022: + return ("AMD Raphael/Granite Ridge USB 3.1 controller"); + case 0x15b81022: + return ("AMD Raphael/Granite Ridge USB 2.0 controller"); case 0x15e01022: case 0x15e11022: return ("AMD Raven USB 3.1 controller"); @@ -109,6 +114,8 @@ xhci_pci_match(device_t self) return ("AMD 300 Series USB 3.1 controller"); case 0x43d51022: return ("AMD 400 Series USB 3.1 controller"); + case 0x43f71022: + return ("AMD 600 Series USB 3.2 controller"); case 0x78121022: case 0x78141022: case 0x79141022: From nobody Mon Jul 14 12:18:00 2025 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 4bghD90djXz61gjm; Mon, 14 Jul 2025 12:18:01 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bghD86sDHz3mk8; Mon, 14 Jul 2025 12:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752495481; 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=BYrWc36T2qIOeQfqk6xaXYO81GCXfTBIhbf4925TQj0=; b=sVXgE+M2N+nEdS7O9WQzzzkezb1WO73GJqZnGlXwnHPRzYr0FFH0qqV3TnkO2TWiF0etrO xXHK4oKPLNY2LXLa+PCpJHusYBW2QmRqL9oM38QaMoBxaOohwpClEldxmaVaeEML5qnGD6 Qw6PUbfjKyc4rAnF93PEl090Jj0bIkMsxhvY7nNA0MoRNqI70tSvQoTdbR0a8rOaw250Gp 7TqkQUmFkj6PIYUs7pV+k/9v2a1MI8inDX+6NY//WkoPger26CyBGyg6/wPeDIZhOcXZWC AlH2y8qLS6owLtauVfOJwhwqY+CSjow1eTd8g8Hqw8efoGBNvdjkMIzXgTLeRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752495481; 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=BYrWc36T2qIOeQfqk6xaXYO81GCXfTBIhbf4925TQj0=; b=mpa0rSOJyr/1tzUqEu6mQKM+IXRZh3YnyZ4O+LVxKY8+TYiHwx9oqZWSsolswQrmf8Nc5O a74Oc3wUGmuV7pWkmIh2qN0JWa2ESvYw/iSSuzKKNq6KdNsg8EwNdxMafRWSShVgXO1hYj OKa3SCY6dic4treFHpUezdm8c97phbqeWoEcDPMxL2pmjPGwCVZaVSsmxES9HVEG6xM+OT 6XcAvEnY24GBOVXkJxcAQrCN+4To052jVQrTa27NOh8aF3pJRFhx8f6h169t0tL0HhLj1a /8vJeNi8/tuUUdXzg900tuC3ECiQ3Ni8/IzsyPOKo97E/UlBQC1x5kgSTZ/IqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752495481; a=rsa-sha256; cv=none; b=DwLRC1U3x47EUBS9NR5LyNerLEvPmxhgumjofTshWSggCTt2qfBA0b/RfDVOMRB0y/1wUR tpFbusZQEDzjLSSH483U9uW+U8VecpQOcy4XTO6mhXZHrfvbtxXOHLL04E76q8gVARcK2f RTLFzHe4goIpMtS7xVdjjNT1wqu+5FKLKCLFH2dtwMp4D9ZJG/SylW9QKicuG7L5oDBXQw mkQDg5NhPsknzFeKozbOdh+Obm+Lp3ko8TFDAYvT+qb29AY2EG/dUp+wt/j2CMgW1CfJB5 5VXNVFqvSdCl7ouuHvKnCD65DzSJ4WOuNlLx6xNucC4pN5aemQ9WNoj+ZapeKw== 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 4bghD86JZTztH0; Mon, 14 Jul 2025 12:18:00 +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 56ECI0UT056720; Mon, 14 Jul 2025 12:18:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56ECI0Yx056717; Mon, 14 Jul 2025 12:18:00 GMT (envelope-from git) Date: Mon, 14 Jul 2025 12:18:00 GMT Message-Id: <202507141218.56ECI0Yx056717@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: b5ec6cda9380 - stable/14 - fortune: Fix typo in dmesgd.nycbug.org example 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b5ec6cda9380ab5ae222c91f161df9f420ab3b5e Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b5ec6cda9380ab5ae222c91f161df9f420ab3b5e commit b5ec6cda9380ab5ae222c91f161df9f420ab3b5e Author: Christos Margiolis AuthorDate: 2025-07-13 21:25:07 +0000 Commit: Christos Margiolis CommitDate: 2025-07-14 12:17:54 +0000 fortune: Fix typo in dmesgd.nycbug.org example No functional change, but commit for correctness nonetheless. MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D51293 (cherry picked from commit 697bf0f416e4fe0fdd974b9eacdaed140fe18061) --- usr.bin/fortune/datfiles/freebsd-tips | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips index aed66f2295e2..a35b7cd5881f 100644 --- a/usr.bin/fortune/datfiles/freebsd-tips +++ b/usr.bin/fortune/datfiles/freebsd-tips @@ -554,7 +554,7 @@ Use "sysrc name=value" to add an entry and "sysrc -x name" to delete an entry. You can upload the dmesg of your system to help developers get an overview of commonly used hardware and peripherals for FreeBSD. Use the curl package to upload it like this: curl -v -d "nickname=$USER" -d "description=FreeBSD/$(uname -m) on \ -$(kenv smbios.system.maker) $(kenv smbios.system.product)" -d "do=addd" \ +$(kenv smbios.system.maker) $(kenv smbios.system.product)" -d "do=add" \ --data-urlencode 'dmesg@/var/run/dmesg.boot' http://dmesgd.nycbug.org/index.cgi % Want to know how much memory (in bytes) your machine has installed? Let From nobody Mon Jul 14 12:18:46 2025 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 4bghF25Jhqz61gbg; Mon, 14 Jul 2025 12:18:46 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bghF246Ysz3nGr; Mon, 14 Jul 2025 12:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752495526; 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=6VXKXHEN0hff3RvS5ysH43QjNwQFYL38tyKzrYW9fzE=; b=S21HkECvj9xgLPkGv86waaReAo3XB/NxvXUFdX7BK6NB0mxP1uN0vNtaCaS18BMmCBXRUb NtNmA4VCunf05oM68yYUajfwC43LRCp3pbmpyewNRvUqrRrkSaQ4R+COgD+rfV3q1XM5sa nGMGWsKqQ9FreW7jS59B/BZpW0TlrUAUAKywlRhpyo2vjxdmDLIK4t7AV3focxQUup4Ecl hsefxi4EFGZHHtwKGrf0AL9+qGKy/OFoHwvRqvjirZ3kyuAWrI+en0/4S4/gJq1SlZ+R21 7k2aSZ6R5zG094CKKwszqATcv2pgy2mjUHatElzugnTpwRIcelML5BbkhQqMAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752495526; 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=6VXKXHEN0hff3RvS5ysH43QjNwQFYL38tyKzrYW9fzE=; b=thDdSy2PBpmQTA30gpcgtUcwyRaxwRr/AyiDt7A/SI8Z2qJgIFHe+Z0SZiQFlsjsnQiVFy Bw8QE0hB2aF6e2ko8t10ZjQZghpYE+lDzk3NVnUe9YZcgxIgwiysDBaGcLc6u+LU6d7+Rh sCtaCm/efqF6uGSrjS7yyGM/LkunxWQBdpk5owQP6YszJfxFjHB/27oRAUxdfiunHfRUdt URzI9CmNMg9edHGHYU4MkJYuzBbgiU6M3oOvcN60B/3IKxAqjcYBjze/S4I6dqOvw9sK2A 8qo3JUHGamMMQXs9cyjqZGz0660zz7p0JjjAJSUjAv5Bd9Kdf0nVya8TwabqhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752495526; a=rsa-sha256; cv=none; b=IoqhtWw5cSqLximQZfOG4UZQyD5BajostRGaOaLDFLRW7TyA7q5XltWhlqU8GaNGX6GrgS 3KHKnnzA06TeOEplG8y9aueUnHmeh6o43awqVy/F7LEyQAhshK8zjzEx/vNv0npWlNKvwm egGCDgbn3i2v3sA0xVNARVHlT6HwrD2K+qK8XdD2YWAdw4cXZta29KiCb4pCoq8blTG2Jy eQF/f8E5yho4zvLU0xbCndPhWIZA0rrDPJxKbA2tL3DJGeFB4XhCIK2qbr1rgbHZcHF8MX LsP8xx1dkneaO1r9zdEf9jfuPX/MNjDQEOmfeSKKJOWt2xbvudW0/Y8y6OYzDQ== 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 4bghF23c4fztSM; Mon, 14 Jul 2025 12:18:46 +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 56ECIk6q057041; Mon, 14 Jul 2025 12:18:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56ECIkiV057038; Mon, 14 Jul 2025 12:18:46 GMT (envelope-from git) Date: Mon, 14 Jul 2025 12:18:46 GMT Message-Id: <202507141218.56ECIkiV057038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: a487606afd9b - main - dtrace_dtrace.4: Document the DTrace dtrace provider 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a487606afd9b7c21d76fce29c43b53c7c7a3a8eb Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=a487606afd9b7c21d76fce29c43b53c7c7a3a8eb commit a487606afd9b7c21d76fce29c43b53c7c7a3a8eb Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-07-11 20:28:26 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-07-14 12:17:04 +0000 dtrace_dtrace.4: Document the DTrace dtrace provider Reviewed by: bcr, christos Event: Berlin Hackathon 202507 Relnotes: yes Differential Revision: https://reviews.freebsd.org/D51267 --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 1 + share/man/man4/Makefile | 1 + share/man/man4/dtrace_dtrace.4 | 191 +++++++++++++++++++++++++++ 3 files changed, 193 insertions(+) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 7a98baf39776..10a6922d79db 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -1223,6 +1223,7 @@ Invalid command line options or arguments were specified. .Xr cpp 1 , .Xr dwatch 1 , .Xr dtrace_audit 4 , +.Xr dtrace_dtrace 4 , .Xr dtrace_io 4 , .Xr dtrace_ip 4 , .Xr dtrace_kinst 4 , diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 7c8a8f3afc45..5648fd2c1a84 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -980,6 +980,7 @@ _ccd.4= ccd.4 .if ${MK_CDDL} != "no" _dtrace_provs= dtrace_audit.4 \ + dtrace_dtrace.4 \ dtrace_io.4 \ dtrace_ip.4 \ dtrace_kinst.4 \ diff --git a/share/man/man4/dtrace_dtrace.4 b/share/man/man4/dtrace_dtrace.4 new file mode 100644 index 000000000000..b8c31005b47e --- /dev/null +++ b/share/man/man4/dtrace_dtrace.4 @@ -0,0 +1,191 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.Dd July 14, 2025 +.Dt DTRACE_DTRACE 4 +.Os +.Sh NAME +.Nm dtrace_dtrace +.Nd a DTrace provider for BEGIN, END, and ERROR probes +.Sh SYNOPSIS +.Nm dtrace Ns Cm :::BEGIN +.Nm dtrace Ns Cm :::END +.Nm dtrace Ns Cm :::ERROR +.Sh DESCRIPTION +The +.Nm dtrace +provider implements three special probes related to the life cycle of the +DTrace program itself. +.Ss dtrace:::BEGIN +The +.Nm dtrace Ns Cm :::BEGIN +probe fires at the beginning of a +.Xr dtrace 1 , +program before tracing has begun. +It provides a convenient place for initializing variables +and printing column headers. +.Pp +Variables such as +.Va stack +or +.Va execname +cannot be relied upon in the execution context of the +.Nm dtrace Ns Cm :::BEGIN +probe. +.Ss dtrace:::END +The +.Nm dtrace Ns Cm :::END +probe fires at the end of a +.Xr dtrace 1 +program, when all tracing has stopped. +.Ss dtrace:::ERROR +The +.Nm dtrace Ns Cm :::ERROR +probe fires when an unexpected runtime error occurs in another probe. +.Pp +The following table describes the arguments to +.Nm dtrace Ns Cm :::ERROR . +.Bl -column -offset indent "Argument" "Definition" +.It Sy Argument Ta Sy Definition +.It Fa arg1 Ta Enabled probe identifier (EPID) +of the probe where the runtime error occurred +.It Fa arg2 Ta Index of the action statement that caused the error +.It Fa arg3 Ta DIF offset into the action if available (otherwise -1) +.It Fa arg4 Ta Fault type +.It Fa arg5 Ta Accessed address (or 0 if not applicable) when +.Va arg4 +is of fault type +.Dv DTRACEFLT_BADADDR , DTRACEFLT_BADALIGN , DTRACEFLT_KPRIV , +or +.Dv DTRACEFLT_UPRIV +.El +.Pp +The fault types are: +.Bl -tag -offset indent -width "DTRACEFLT_NOSCRATCH" -compact +.It Dv DTRACEFLT_UNKNOWN +Unknown fault +.It Dv DTRACEFLT_BADADDR +Bad address +.It Dv DTRACEFLT_BADALIGN +Bad alignment +.It Dv DTRACEFLT_ILLOP +Illegal operation +.It Dv DTRACEFLT_DIVZERO +Divide-by-zero +.It Dv DTRACEFLT_NOSCRATCH +Out of scratch space +.It Dv DTRACEFLT_KPRIV +Illegal kernel access +.It Dv DTRACEFLT_UPRIV +Illegal user access +.It Dv DTRACEFLT_TUPOFLOW +Tuple stack overflow +.It Dv DTRACEFLT_BADSTACK +Bad stack +.El +.Sh FILES +.Bl -tag -width '' +.It In sys/dtrace.h +The header file containing the definitions of DTrace fault types. +.El +.Sh EXAMPLES +.Ss Example 1 : Custom Column Headers +The following script uses the +.Nm dtrace Ns Cm :::BEGIN +probe to print column headers. +Note the pragma line setting the +.Ql quiet +option to disable the default column headers. +.Bd -literal -offset 2n +#pragma D option quiet + +dtrace:::BEGIN +{ + printf(" %12s %-20s %-20s %s\en", + "DELTA(us)", "OLD", "NEW", "TIMESTAMP"); +} +.Ed +.Ss Example 2 : Handling Runtime Errors with dtrace:::ERROR +The following script causes a runtime error by dereferencing a pointer +on address +.Ad 19930908 +in the +.Cm BEGIN +probe. +As a result, the +.Cm ERROR +probe fires and prints out +.Dq Oops +along with the probe arguments. +At that point, the program ends and fires the +.Cm END +probe. +.\" It might look weird to define ERROR first, but that is on purpose. +.\" This way the probe IDs and EPIDs are a bit more mixed up +.\" and are easier to understand. +.Bd -literal -offset 2n +ERROR +{ + printf("Oops\en"); + printf("EPID (arg1): %d\en", arg1); + printf("Action index (arg2): %d\en", arg2); + printf("DIF offset (arg3): %d\en", arg3); + printf("Fault type (arg4): %d\en", arg4); + printf("Accessed address (arg5): %X\en", arg5); + exit(1); +} +BEGIN +{ + *(int *)0x19931101; +} +END { + printf("Bye"); +} +.Ed +.Pp +This script will result in the following output: +.Bd -literal -offset 2n +CPU ID FUNCTION:NAME + 2 3 :ERROR Oops +EPID (arg1): 2 +Action index (arg2): 1 +DIF offset (arg3): 16 +Fault type: 1 +arg5: 19931101 + +dtrace: error on enabled probe ID 2 (ID 1: dtrace:::BEGIN): invalid address (0x19931101) in action #1 at DIF offset 16 + 2 2 :END Bye +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr tracing 7 +.Rs +.%B The illumos Dynamic Tracing Guide +.%O Chapter dtrace Provider +.%D 2008 +.%U https://illumos.org/books/dtrace/chp-dtrace.html +.Re +.Sh AUTHORS +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . +.Sh CAVEATS +The +.Nm dtrace Ns Cm :::ERROR +probe arguments cannot be accessed through the typed +.Va args[] +array. +.Pp +.Xr dtrace 1 +will not fire the +.Nm dtrace Ns Cm :::ERROR +probe recursively. +If an error occurs in one of the action statements of the +.Nm dtrace Ns Cm :::ERROR , +then +.Xr dtrace 1 +will abort further processing of +the +.Nm dtrace Ns Cm :::ERROR +probe's actions. From nobody Mon Jul 14 12:18:58 2025 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 4bghFH1YwHz61gbk; Mon, 14 Jul 2025 12:18:59 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bghFG5B78z3nRy; Mon, 14 Jul 2025 12:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752495538; 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=zUbFuGt5WU56eNK1G+TnOq9y9+I1EtocR3tsBzOTqv4=; b=d2PFGoeRMzGxVPmhj7AJsO4mxsg7v9YQasiWcDGCKoHmqrEBZNFjanNyJLUkNnznmwfwoB gCYbcqQ9eJ/ByjezUtY0946MqFXt+wlbOJKZd2FxbPrJHQ8NHwhxAbprVO9ra/A8kKtvIo rBXxsP+b9h3RFwNUUT9KszAVdjCicRAX6yapppwKl7IDw6rq+WHaTjlqjCjt0ylM8YS1TN iAhsLSr025wW40FWVzNybDva+iJiOeZ6xPDJM58kJWcP7daL/U3j2P8i9TZ4Fl7UO650xG /gENaK6uhIHU/nTzBh9StcaepNXQNKBB+8pBUYlyn1QqODibTZCphgrIPdJZRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752495538; 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=zUbFuGt5WU56eNK1G+TnOq9y9+I1EtocR3tsBzOTqv4=; b=dfskWWMf8Nyy2txmdGO7K4b5cRNAZFCHem2DU7chNQVpkgtt+k6SJlwOe6Wc57XLSX7Zfg HYBPF6R0/CiUaLIaA6TLI9/AfC/67+uR13Xnof3ckXWpsYSGW60P166mkDhNzWee/94PxH wbe2e16Fc6cEeKpIdugs1ScX37he4NotxNms5S59bFrbnigpFYpQy5E9ZBDOT0gUxFSEHH cY9bvZtT+Q9159VyaZwWktBr9O8DWEAUvXPPQZaAFzsOkvDKpkf5WHmENJadW2uBT4yieE jt52CPlebPvJb3CrOENWfAQZHcDsMOHKVAZQuBOn1vb3WYr32no5Q7AtYMfrIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752495538; a=rsa-sha256; cv=none; b=RnsUl5Q5j5eGLnIpWktJfPx5N8YkynHwtoTdDUxsFklMfRxwh0QGsQ9shqR0gzU5o6nuYJ 5jqsRTAfcmAYYZ5dE1UjtytVtNb300izquuwcr3sHoRMzRpaF5cf88eHM1aYj4APmEoBos 9huMQBI8xh3a0/UO1keCsbHbfSwnWFlDYyVdUJrYJMqStYdsOmjXSHA1UeK8iBrlM81ikE FT/hY+40o86LmK/l1bsdbYBCB/T08FL31WKUNjCZ/lYANBgnYr5Fyg9OlqbhDodabwDTg+ rb0fVqiifgDm+IAtXVB5fxA2lM6aA9KkXQqMrYCky/XavnwOAoZfywYz3/BeAw== 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 4bghFG4bzgzthV; Mon, 14 Jul 2025 12:18:58 +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 56ECIw4D057229; Mon, 14 Jul 2025 12:18:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56ECIwjG057226; Mon, 14 Jul 2025 12:18:58 GMT (envelope-from git) Date: Mon, 14 Jul 2025 12:18:58 GMT Message-Id: <202507141218.56ECIwjG057226@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: c2b1623bb97e - stable/14 - truss.1: Reference sysdecode(3) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c2b1623bb97e5e2df8447892d22bc64250982f0d Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=c2b1623bb97e5e2df8447892d22bc64250982f0d commit c2b1623bb97e5e2df8447892d22bc64250982f0d Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-06-18 17:40:27 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-07-14 12:18:32 +0000 truss.1: Reference sysdecode(3) MFC after: 1 week (cherry picked from commit fa9ac741d03342c33a0e8f85114949625ba4901f) --- usr.bin/truss/truss.1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.bin/truss/truss.1 b/usr.bin/truss/truss.1 index a0cd90b229aa..debb3af11b5d 100644 --- a/usr.bin/truss/truss.1 +++ b/usr.bin/truss/truss.1 @@ -1,5 +1,5 @@ .\" -.Dd July 24, 2017 +.Dd June 18, 2025 .Dt TRUSS 1 .Os .Sh NAME @@ -104,7 +104,8 @@ Follow an already-running process: .Xr kdump 1 , .Xr ktrace 1 , .Xr ptrace 2 , -.Xr utrace 2 +.Xr utrace 2 , +.Xr sysdecode 3 .Sh HISTORY The .Nm From nobody Mon Jul 14 13:02:19 2025 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 4bgjCJ0SXMz61k1d; Mon, 14 Jul 2025 13:02:20 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgjCH4TfBz3G7X; Mon, 14 Jul 2025 13:02:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752498139; 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=p9XLN5FLrhGWfEUlkhsP0Bpf07JPEOPn/ffGS1K51kE=; b=W4RNNGW+50zcLSy2tWLqv7v/F05m80mpTauWy0rx6ViMDpzprtZDeu11sPy16tCpGn4VPW cw99NMrbysKmk2kx7VAFg8kknQounqMgkT2HgqNBFJPZjNbIyALssvJ6XlzzXBQxCwBhlK uK2gu/Xrs3RKtfoKxQTp5fW/4s45gFiKPZADBdYRlj57l0MCo3xTpq2ZYCrA7bcnV1pQIz qn9HUwr/a6NXJLZIEoTGd6yv30MOm3u7vKEKC6mDsM91GEcWEfPL297PUfu0DXJ8qPAiMt G6VF++bDnZdD1Rlx0SX175kmQ9eOPsx1znCDXzq97QfT1JJOksZTJMHHVrPgSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752498139; 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=p9XLN5FLrhGWfEUlkhsP0Bpf07JPEOPn/ffGS1K51kE=; b=F9SI3fTtKqSAbwnRjMwjkhGBpNDKP9ISdXGdI/GyWTEBfkgMJQ5lkEQI2yoofiJd11sXss zcYtYYTITnYF81+hBzfDL+TLdW6FTTpHr5/mweos3UUGPhQEWCVkcji8oaw2Z7WizE9kNF 1Syk1J48la34RcZdfP9I3WHyTj+U0BKjyx7JDFtEYfi9hkdlVg4vUgeKe2dixIcSyq/3pD aqwbDBsYGOyHq04gXjiZikpB+jpiP+07+LEflA5SZCOvnZiHGuTblIs2ynvZK6iAA7TRXV dwXp4lDE3CgSrmjkP+GL1xjQNCdfK96Ug+LeSw6q/abSy/KLkq1ZQR2rJwCT+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752498139; a=rsa-sha256; cv=none; b=M3+f1X8Jb/5WQAKbPYFc1cD037dQ/fKqqzx4Hvq/K/JNU1KFGZS0UPdKVBUXDbqxT1Ghvy onG0yMPxenI2E72ZpHb9inoXqHNPo1vaLuWooDwzfQz3XmEosLaN4VNm1RaBg1GlIk9X8I a3ZH6YUgpQ8nk55fOwjPMGWzvyvKSPyAwmB3lSzmt08Fg646BiXlmhFcFajlbiO/9aIfpC VgyE3B6i4G8Dfqe3E+BpLhilauYN3BprUk1HAo6ECMpCWdmmkfEFRd/qg9fYBjdajZM7L1 7FFKMC2idVvaZJeb/wkb5Nksyx8FLjp66xWwVIaQYbh88ePRSssyIrNrAZyWVw== 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 4bgjCH44gwzw4D; Mon, 14 Jul 2025 13:02:19 +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 56ED2JW4049364; Mon, 14 Jul 2025 13:02:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56ED2JbT049361; Mon, 14 Jul 2025 13:02:19 GMT (envelope-from git) Date: Mon, 14 Jul 2025 13:02:19 GMT Message-Id: <202507141302.56ED2JbT049361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 193f2289fc9a - main - d.7: Document the DTrace scripting language 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 193f2289fc9a5c7464b460e1e61c2c0ac8c9f57d Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=193f2289fc9a5c7464b460e1e61c2c0ac8c9f57d commit 193f2289fc9a5c7464b460e1e61c2c0ac8c9f57d Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-07-11 18:10:58 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-07-14 13:01:51 +0000 d.7: Document the DTrace scripting language Reviewed by: bcr, christos, ziaee Event: Berlin Hackathon 202507 Relnotes: yes Differential Revision: https://reviews.freebsd.org/D51268 --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 3 +- share/man/man7/Makefile | 1 + share/man/man7/d.7 | 287 +++++++++++++++++++++++++++ share/man/man7/intro.7 | 5 +- 4 files changed, 294 insertions(+), 2 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 10a6922d79db..f3d7a49e0e78 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 12, 2025 +.Dd June 14, 2025 .Dt DTRACE 1 .Os .Sh NAME @@ -1235,6 +1235,7 @@ Invalid command line options or arguments were specified. .Xr dtrace_udp 4 , .Xr dtrace_udplite 4 , .Xr elf 5 , +.Xr d 7 , .Xr tracing 7 , .Xr SDT 9 .Rs diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile index 7daa0ffed8ea..1e50242a1754 100644 --- a/share/man/man7/Makefile +++ b/share/man/man7/Makefile @@ -6,6 +6,7 @@ MAN= arch.7 \ bsd.snmpmod.mk.7 \ build.7 \ c.7 \ + d.7 \ clocks.7 \ crypto.7 \ development.7 \ diff --git a/share/man/man7/d.7 b/share/man/man7/d.7 new file mode 100644 index 000000000000..30efb0249a77 --- /dev/null +++ b/share/man/man7/d.7 @@ -0,0 +1,287 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.Dd July 14, 2025 +.Dt D 7 +.Os +.Sh NAME +.Nm D +.Nd DTrace scripting language overview +.Sh SYNOPSIS +.Sm off +.Ar provider Cm \&: +.Ar module Cm \&: +.Ar function Cm \&: +.Ar name +.Sm on +.Sm off +.Oo +.Cm / +.Ar predicate +.Cm / +.Sm on +.Oc +.Op Cm \&{ Ns Ar action Ns Cm \&} +.Sh DESCRIPTION +.Nm D +is the +.Xr dtrace 1 +scripting language. +This manual provides a brief reference of the +.Nm +language and scripting. +.Pp +This manual page serves as a short reference of the language. +Refer to books listed in +.Sx SEE ALSO +for a complete reference. +.Sh PROBE'S DESCRIPTION +A probe's description consists of four elements: +.Sm off +.D1 Ar provider Ns Cm \&: Ns Ar module Cm \&: Ar function Cm \&: Ar name +.Sm on +.Pp +The exact meaning of +.Ar module , +.Ar function , +and +.Ar name +depends on +.Ar provider . +.Sh USER-DEFINED VARIABLE TYPES +.Bl -column "thread-local" "Syntax" +.It Sy Type Ta Sy Syntax +.It global Ta Va variable_name +.It thread-local Ta Sy self-> Ns Va variable_name +.It clause-local Ta Sy this-> Ns Va variable_name +.It aggregate Ta Sy @ Ns Va variable_name +.El +.Pp +.Em Tips : +.Bl -dash -compact +.It +Always use the variable type with the smallest scope +to minimize processing overhead. +.It +Use aggregate variables instead of global variables when possible. +Aggregate variables are multi-CPU safe in contrast to global variables. +.El +.Sh BUILT-IN VARIABLES +.Ss Probe Arguments +.Bl -tag -width "arg0, ..., arg9" +.It Va args[] +The array of typed probe arguments. +.It Va arg0 , ... , arg9 +The untyped probe arguments represented as 64-bit unsigned integers. +Only the first ten arguments are available this way. +.El +.Ss Probe Information +.Bl -tag -width probeprov +.It Va epid +The enabled probe ID which uniquely identifies an enabled probe. +An enabled probe is defined by its probe ID, its predicates, and its actions. +.It Va id +The probe ID which uniquely identifies a probe available to DTrace. +.It Va probeprov +The +.Ar provider +in the probe's description +.Sm off +.Pq Ar provider Cm \&: Ar module Cm \&: Ar function Cm \&: Ar name +.Sm on . +.It Va probemod +The +.Ar module +in the probe's description +.Sm off +.Pq Ar provider Cm \&: Ar module Cm \&: Ar function Cm \&: Ar name +.Sm on . +.It Va probefunc +The +.Ar function +in the probe's description +.Sm off +.Pq Ar provider Cm \&: Ar module Cm \&: Ar function Cm \&: Ar name +.Sm on . +.It Va probename +The +.Ar name +in the probe's description +.Sm off +.Pq Ar provider Cm \&: Ar module Cm \&: Ar function Cm \&: Ar name +.Sm on . +.El +.Ss Process Information +.Bl -tag -width execname +.It Va execargs +The process arguments. +Effectively, +.Ql curthread->td_proc->p_args . +.It Va execname +The name of the current process. +Effectively, +.Ql curthread->td_proc->p_comm . +.It Va gid +The group ID of the current process. +.It Va pid +The process ID of the current process. +.It Va ppid +The parent process ID of the current process. +.It Va uid +The user ID of the current process. +.El +.Ss Thread Information +.Bl -tag -width curlwpsinfo +.It Va uregs[] +The saved user-mode register values. +.It Va cpu +The ID of the current CPU. +.It Va stackdepth +The kernel stack frame depth. +.It Va ustackdepth +The userspace counterpart of +.Va stackdepth . +.It Va tid +The thread ID. +Depending on the context, +this can be either the ID of a kernel thread or a thread in a user process. +.It Va errno +The +.Xr errno 2 +value of the last system call performed by the current thread. +.It Va curlwpsinfo +A pointer to the +.Vt lwpsinfo_t +representation of the current thread. +Refer to +.Xr dtrace_proc 4 +for more details. +.It Va curpsinfo +A pointer to the +.Vt psinfo_t +representation of the current process. +Refer to +.Xr dtrace_proc 4 +for more details. +.It Va curthread +A pointer to the thread struct that is currently on-CPU. +E.g., +.Ql curthread->td_name +returns the thread name. +The +.In sys/proc.h +header documents all members of +.Vt struct thread . +.It Va caller +The address of the kernel thread instruction at the time of execution +of the current probe. +.It Va ucaller +The userspace counterpart of +.Va caller . +.El +.Ss Timestamps +.Bl -tag -width walltimestamp +.It Va timestamp +The number of nanoseconds since boot. +Suitable for calculating relative time differences of elapsed time and latency. +.It Va vtimestamp +The number of nanoseconds that the current thread spent on CPU. +The counter is not increased during handling of a fired DTrace probe. +Suitable for calculating relative time differences of on-CPU time. +.It Va walltimestamp +The number of nanoseconds since the Epoch +.Pq 1970-01-01T00+00:00 . +Suitable for timestamping logs. +.El +.Sh BUILT-IN FUNCTIONS +.Ss Aggregation Functions +.Bl -tag -compact -width "llquantize(value, factor, low, high, nsteps)" +.It Fn avg value +Average +.It Fn count +Count +.It Fn llquantize value factor low high nsteps +Log-linear quantization +.It Fn lquantize value low high nsteps +Linear quantization +.It Fn max value +Maximum +.It Fn min value +Minimum +.It Fn quantize value +Power-of-two frequency distribution +.It Fn stddev value +Standard deviation +.It Fn sum value +Sum +.El +.Ss Kernel Destructive Functions +By default, +.Xr dtrace 1 +does not permit the use of destructive actions. +.Bl -tag -width "chill(nanoseconds)" +.It Fn breakpoint +Set a kernel breakpoint and transfer control to +the +.Xr ddb 4 +kernel debugger. +.It Fn chill nanoseconds +Spin on the CPU for the specified number of +.Fa nanoseconds . +.It Fn panic +Panic the kernel. +.El +.Sh FILES +.Bl -tag -width /usr/share/dtrace +.It Pa /usr/share/dtrace +DTrace scripts shipped with +.Fx +base. +.El +.Sh SEE ALSO +.Xr awk 1 , +.Xr dtrace 1 , +.Xr tracing 7 +.Rs +.%B The illumos Dynamic Tracing Guide +.%D 2008 +.%U https://illumos.org/books/dtrace/ +.Re +.Rs +.%A Brendan Gregg +.%A Jim Mauro +.%B DTrace: Dynamic Tracing in Oracle Solaris, Mac OS X and FreeBSD +.%I Prentice Hall +.%D 2011 +.%U https://www.brendangregg.com/dtracebook/ +.Re +.Rs +.%A George Neville-Neil +.%A Jonathan Anderson +.%A Graeme Jenkinson +.%A Brian Kidney +.%A Domagoj Stolfa +.%A Arun Thomas +.%A Robert N. M. Watson +.%C Cambridge, United Kingdom +.%D August 2018 +.%T Univeristy of Cambridge Computer Laboratory +.%R OpenDTrace Specification version 1.0 +.%U https://www.cl.cam.ac.uk/techreports/UCAM-CL-TR-924.pdf +.Re +.Sh HISTORY +This manual page first appeared in +.Fx 15.0 . +.Sh AUTHORS +.An -nosplit +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . +.Sh BUGS +The +.Va cwd +variable which typically provides the current working directory is +not supported on +.Fx +at the moment. diff --git a/share/man/man7/intro.7 b/share/man/man7/intro.7 index d889c2dd299f..43e48de87bc5 100644 --- a/share/man/man7/intro.7 +++ b/share/man/man7/intro.7 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 23, 2025 +.Dd July 14, 2025 .Dt INTRO 7 .Os .Sh NAME @@ -49,6 +49,9 @@ system timekeeping clocks available in .It Xr crypto 7 cryptographic algorithms provided by OpenCrypto in .Fx +.It Xr d 7 +.Xr dtrace 1 +scripting language overview .It Xr development 7 development introduction to .Fx From nobody Mon Jul 14 14:38:51 2025 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 4bglNt70D6z61qBl for ; Mon, 14 Jul 2025 14:40:46 +0000 (UTC) (envelope-from garyj@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (3072 bits) client-digest SHA256) (Client CN "mout.gmx.net", Issuer "Telekom Security ServerID OV Class 2 CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bglNs4QQnz4559 for ; Mon, 14 Jul 2025 14:40:45 +0000 (UTC) (envelope-from garyj@gmx.de) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmx.de header.s=s31663417 header.b=QDTrHsne; spf=pass (mx1.freebsd.org: domain of garyj@gmx.de designates 212.227.17.22 as permitted sender) smtp.mailfrom=garyj@gmx.de; dmarc=pass (policy=quarantine) header.from=gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1752504042; x=1753108842; i=garyj@gmx.de; bh=sL+RcCdaREYfxLQnUtdJacNIXpc47Faan9KxjT31Xsc=; h=X-UI-Sender-Class:Date:From:To:Subject:Message-ID:In-Reply-To: References:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:cc:content-transfer-encoding: content-type:date:from:message-id:mime-version:reply-to:subject: to; b=QDTrHsneydfW6VDFqhPBiGwJbpA4bKgG2a+sffoWwJIEh3UAnd3BEgEcAs5pL+e3 SiSzR1gFfT/7u1V+0ziFbI+BZCGx9PPa9JvwJVDJIF+hcJ1+HobHdHIZwDzPuqP7V NAPFbKOeC4uss8RvFgllCRA2bsVbN5i/vIkpAt/cgWWXo9qvguKtSLap5WbBhtwjc rPPexQmz4j0mwD2sxdMcnrYT722zehHZ2rfDrq3XMc2jWWNq/ldHWfHIXcw5FUdIc JMyAKZ1FmFdPaMES+ereEXbFUpBNLLvnDQCF98JI1+LMS3LJguH/Zw33RExaS4i6s tJIR74XklAZ2w20b+Q== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from ernst.home ([91.59.228.125]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M2f9b-1uchnh1hUd-00C0at for ; Mon, 14 Jul 2025 16:40:42 +0200 Date: Mon, 14 Jul 2025 14:38:51 +0000 From: Gary Jennejohn To: dev-commits-src-all@freebsd.org Subject: Re: git: 193f2289fc9a - main - d.7: Document the DTrace scripting language Message-ID: <20250714163851.14f7ba16@ernst.home> In-Reply-To: <202507141302.56ED2JbT049361@gitrepo.freebsd.org> References: <202507141302.56ED2JbT049361@gitrepo.freebsd.org> Reply-To: garyj@gmx.de X-Mailer: Claws Mail 3.20.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Hz+Y185l/o9jI0bJ9ENDbXdudA9zIGoVXncIM267ZXrr6XNOH1j 6HE5Zodr9DVEOXCfJ8FK4ZW6pU+zm7jsHIiAPLFqKvfJgUi1wQnMdXnwfITHXUx4rhlUWOc btcjtWXLuVOcz4vqj6E+V7s3d+o394vcCN0d/igQAaY7rE3d/nwyGbBGcQBVpy6/oW6PUPM 9srH8Wcia+PNAsp+XUEkw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:7LJDsupHNUo=;8TZDMDH08aAAzCxh8QtstAaILvn 5SpXBbrFzUO1Jv0bKTOg9VXv7STdd5Dx7Qd8W66pGyiOIWfpDLU4eBXojFsZXwIsMyItqpVjm SgE5+hqH5qSe89xHiHfcb1AR6kkFCN7gMQ7vOwUg6BAgYbX5EH7pibkOQyB2jdJQCJN+BRN2m GxE/rzBSYF+LJxjd9AptnggXYXyJoHbE08mHxZzcBnm6V8Snhqc23xfWwCgZOeSs1dcKwstTO YBs4AaGYbBn3HWu1a1Q6JXyAsdi+YEVFRJkTqRU9W4XvuGLkimmexa9XSXVduNWXgktCnHViK MwYTWOgrOGmuRX2DnFBNOA29RMTybGSo/b1rH1Px7x5t7xST7mgBrbl27Y6creq7O1GE12QoA 0vpF4ZprqUHpWS+Q89LmktWIp8UdEnh3Ru85WbzL1D/LBpLzyxGGytJVo/1Xam0hl38hOmZxG Hbn06kp9aYxD6PsELAlFwHxXQqQLo3DOsc/mP6mFlGbFxAPAo5mX5EA5fco0WM5hR/fT+j/oR wEkdFyA0qxCRuFhOAjVxvbY0u8WOsb67g4BRXv7cAJ0rH1wF2VDylN2k6TXb2yJ8htKdUsS29 yAk+sROWLaTIlU4xJ7aqpElDta2S0Pbor89P6r6bOmaNjvzTz40r7dnoxqNv5NtYrlu8IxeiT MHav6fZKyZPKRemlGsR+KGyL2ausj71r6xZlTRlhT9hg/ZgilSAaR8dzhH3jYEDTZ/WIKXhYE 7Ey30pNfAgDKG86HqVRJnECRSQo84Zuqk/Yc+X6Da+2Xnx3R2sYHTsaIDEtBu3zKqKMd1eaXq UVOcG1AdEbjMuXjbZdTuLR28I0FF2JdYYvCjwoURDSAbBpDo/ws5kW8iq8+7mpOMh8wFKFKZx NO4iRqhyplHK0nI/fhY6Pny4LsOKpJnkOi9aIGUOCMDv9Z723kFZzwnT7fmpXSCQ63fQjROcb 7pVl5Iti08xputCIwuj1nXo7d7yKVETtnAeOjMSfhtfi4op/7toK17/KPSjBkE1c+cl4u4dQJ WzyJBL1yEE3dcsi07MEH6OvSmhogsjqRpuPtwo19QIGKzM24pvH96UxMQ0JeiinKILYzlkfNT A+jQ0iDD8Jmd1PG2fUZaHEgTH/tj9ik4z3Qxe9oH1rGhc0qKe8d/hDQH0HNzaFmSex+6njhbt 11GzFOQ2emImydKs708k1I/LaLtYK4OHx44UCvu3PvT6OknBDy1XjgiMznrP4uX825qO+Pf7H X3GidIAFDJ0YrA5R8V6LW+vX4xmv0Se1o2+BMjYR/RNQrxpkeUZlDGMqLtn5pR2mU/e6rMQgo W/e0BbAVPdKv2n9NCvJWdtZ4iyxeX3Qiuh0osylOyK1byIi3vViLPmAISX28faSfPaDwP2SG8 N8iFmlWHKUr/WXahPU9D+gVDKe8EbVgyRpkrOYHg8C7JF+N82zXCg5eEBdoDzYqPfjtoEcVEZ dNaWwOhQVKM+OGSBYIw5Tf/gFrdEhbj7RKceYPyxP0Y37hBHMGMI8PytVdzfUA8b2BkJ61eCL /57in/4zpOkbqEybBCT9QEavq9koeHyGmjlj9rMl5ah8Od+G66PWDFHZoa53wyHyYKFYayoj8 xKS3q5GvKeg+408RU0aZJ5FEdQREHspFawN7UN5RXseUAyVqnjzAQFishi9xteRvPX7VQheic LZGMZGI7jaH4HioUSxMcimyztVBNI+livLMy1xGEmOhspwIOLP4P3W/u6jYfya7vU2v7sta9G BDfr908GHrZXdyADSmedUg2P9eOXkFF0gcmiGwUuVkFusk4GOAg59b2DtAE2nnYyEqnobe+pK faTMbTHbWbxaIvoST26cn6LZ/ph7+Pw7wuMf1Nks81NGSpmEtbQavB5yixUy4d2khb1/1iuQv npxNTM9gxnOvq2k6vGwV6y4UNuHpMSJhER78NKZ78XUHYOngymON2R5xRYcKTj9n9/qE2WHx+ KKZ7pI/GRDSmngeRLrg0h8lz+h10ZGP52lewCYg15VLRaLzY+Pe7TctmVjTZ2BKWEwIlSh5gh OZXQYDCgkc7vgKkDmRoRe6ay1x1BbOen4Fe6u2ft6xc6lRDpl8BzPySETXpNf+PzSVYScw0Bj 0d5TvQc+5InBlBGM142t1a1ueEuop6rcZawclEwPKb5k5B7phFY8n2CB8+/LEs8EWz6MVb27u QYkR3vKt7Nsl9eOj1XfqX+YGhi57rRh/F+CwvhhJCpAZYgjOqVdkStEwDf5sHS3yeF8DoUcty o/LphFBVYP+b/c+94rRpsfdNNuu7VGwgL66nqWEa7O8alT3TcuXb7vXzAlg3eykr6H6QRoZUH KLm3qyPxH9X1hbGjWGuWbNSiV9AdToqvW8azsuzicpJOHuMZwyGj7saX8AwARe5Zs8NpTfvo1 yDlM3kOQxaQi/ngU1KsazGv2vDt0lgiJv9pWO8++pIxNGU1JZxU91XnFijkKJWsgigVWR0Dnf EYvMh/Pma13jFBEUyprm9YvmtUxPdYItxJceO6Y++q1IxLRkj3naEr8B0M4PYbZDK250OVjjh p6ukyucPUUDy3B7Up5Yw1gQXs7Xh/rtPxYkk6TWi+FVbI/OzLC1V4T2HjzeFkq7esx1Estbjr F8mpUelxnwM9/Z6l3INtSSuC9uTRyq51XjH8eDQFRVvniNFAkqjESNb5JyAeT+nXQydl9Xl4A p7CWFf6Rqi5Y6T8Gjk8SWay48SZYK+xMd1XXffFegyf2nQRP5DYVe7hsFv2BMKCJwD0xPZEoY JAE5MtbCr/FNmAkWRuDOlwPS3iDwI4QrWJLzxvwL6tod5jpoysQtnRK5KMr4nodsBOj5Bqz4a v8hKXJfaUwtySGsZJRgRmwfABiHGtyKB8aoATdLPjIohSfpS3TgNPUx4pcCA29IpgwNHUJPTt 5UngoMgkXAJUwvarzP2Qnl1XgGBBw9hAYKLt1a4P06Ev8JuqX1qK8cwkbXjtfQudDETwl3lUk W4j+Z4bfYDuqeMwXG77MMISeEHnGCc1Eopfxvd61rzQYEh9426GhWVil+nqE6z+Ltd9T06RGi nFp9ALVC4KW5HlowGddCLuUGRDW9W2hFCl/ACX9g0p1Aal6smp+U/BmBAUHrtj1d9eZtr6/qF LO3NIDYYNFCG9Mfd3lpwL4AevjTwy4he5FnYeWrmgEmQ8s90dR8hEu6gggtvkWjtFPfrNrYf7 wtV6Hwq61C6BPXMPYWf+gXWCvwOcUAEnCONvVejBGnGLfUKbeCFhJc2zFnw+tkmkah/g5ga8S CBpu9Ebksww1qb4dJf6vnCfKY9fv6ihnsstRjslW0V/1A7FOQmjdP2iHmL78JoTR84w1v54Tl YM+JR6m4Ps0xXqj0g8SfaOfiqUmA4BroOMJOMSSZie+xPDsgFPFy6C7hoRJD74d7OXRh4ecca HvYoA96k/RWOhuBivuwbefG1SUE8Tk/Ov58PnEgx7EYoUzzfXBIUvZwn3fB0UwwAVTFISvCwe d93Kg7YSlrw+8yD4xghJ4zkV9YiDj/j23nAu783FkrWjM91ou+EK7qjOw1K9b4CVH8zsIMoqg WgkNh1sei6VZBqeTxFf8OxC8ReP7K7RARUtplLzW1vLaxMmoHRoHFi+0XyBpBbNBng== X-Spamd-Result: default: False [1.78 / 15.00]; NEURAL_SPAM_MEDIUM(1.00)[1.000]; NEURAL_SPAM_LONG(1.00)[1.000]; NEURAL_SPAM_SHORT(0.88)[0.884]; DMARC_POLICY_ALLOW(-0.50)[gmx.de,quarantine]; ONCE_RECEIVED(0.20)[]; RWL_MAILSPIKE_VERYGOOD(-0.20)[212.227.17.22:from]; R_SPF_ALLOW(-0.20)[+a:mout.gmx.net]; R_DKIM_ALLOW(-0.20)[gmx.de:s=s31663417]; RCVD_IN_DNSWL_LOW(-0.10)[212.227.17.22:from]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmx.de]; FREEMAIL_FROM(0.00)[gmx.de]; MIME_TRACE(0.00)[0:+]; FREEMAIL_REPLYTO(0.00)[gmx.de]; REPLYTO_DOM_NEQ_TO_DOM(0.00)[]; DKIM_TRACE(0.00)[gmx.de:+]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; REPLYTO_ADDR_EQ_FROM(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; ASN(0.00)[asn:8560, ipnet:212.227.0.0/16, country:DE]; RCVD_VIA_SMTP_AUTH(0.00)[]; HAS_REPLYTO(0.00)[garyj@gmx.de]; RCVD_COUNT_ONE(0.00)[1]; FROM_HAS_DN(0.00)[] X-Rspamd-Queue-Id: 4bglNs4QQnz4559 X-Spamd-Bar: + On Mon, 14 Jul 2025 13:02:19 GMT Mateusz Piotrowski <0mp@FreeBSD.org> wrote: > The branch main has been updated by 0mp: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D193f2289fc9a5c7464b460e1e= 61c2c0ac8c9f57d >=20 > commit 193f2289fc9a5c7464b460e1e61c2c0ac8c9f57d > Author: Mateusz Piotrowski <0mp@FreeBSD.org> > AuthorDate: 2025-07-11 18:10:58 +0000 > Commit: Mateusz Piotrowski <0mp@FreeBSD.org> > CommitDate: 2025-07-14 13:01:51 +0000 >=20 > d.7: Document the DTrace scripting language > =20 > Reviewed by: bcr, christos, ziaee > Event: Berlin Hackathon 202507 > Relnotes: yes > Differential Revision: https://reviews.freebsd.org/D51268 > --- > cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 3 +- > share/man/man7/Makefile | 1 + > share/man/man7/d.7 | 287 ++++++++++++++++++++= +++++++ > share/man/man7/intro.7 | 5 +- > 4 files changed, 294 insertions(+), 2 deletions(-) >=20 > diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib= /opensolaris/cmd/dtrace/dtrace.1 > index 10a6922d79db..f3d7a49e0e78 100644 > --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 > +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 > @@ -20,7 +20,7 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd July 12, 2025 > +.Dd June 14, 2025 > .Dt DTRACE 1 > .Os So, why has the Dd. gone backwords from July 12, 2025 to June 14, 2025? Probably a typo, since July 14 is used everywhere else. =2D-=20 Gary Jennejohn From nobody Mon Jul 14 14:46:27 2025 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 4bglWS1Gdmz61qZY; Mon, 14 Jul 2025 14:46:28 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bglWS0bKhz48vg; Mon, 14 Jul 2025 14:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752504388; 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=bGJY+4TrVgkk1fzJ6d3CrEMl8ZXylgHvPtlu2/Ut7pU=; b=f2d5xK1ZWa2K4ARo85KjJchNNJa12axOZDxAia/DUzRFDmCxDUJ/Jl7Jcot1MGWrOstLPC 1x7vpS4+t3QtDRbI9pQcKFwkk0wWqw+k2M1Y3ZaFEyh2uSNYYpG9MlbcNb3r61nDbasWN5 7lUUoyn3MBiN3JQGbAQUMh5rZ3KEiLRu2wsb4xvYiyTRFl7fGxxJg8PAO8fAi3obVqZWbj OkfEMl+M39wLIb3LzV5a1iSAdHggb0UWhrW18/Kc8OaZPMsVxidQzY1QoJihV28umLLLU6 4b1LIKP0JKq87JFt/A3YSEtR0hlX79P0uL3z7Io+TSCVBQrtj14elMcG8lvHaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752504388; 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=bGJY+4TrVgkk1fzJ6d3CrEMl8ZXylgHvPtlu2/Ut7pU=; b=AA6mwEj7GhT/P7psF6hhYuFd8fp8rcralsRvKJfH8bk6nY6CGJuJ8ghUE8+al0X9yVAq4r qs2PGgcVvPY8gMa5pkx6oa7kfXm+Hx4qNRuAH6BEO8Jf95kYSEFI8CdNgC6CSwHkW40uWo xsHI1d1yHlnj8YwsxwlGDopO8h29YIWmhYg6ZQ78ADvDnCyNwhhXbxI7hJ5ZGT0VlcCukc 80gJIdyEbrOR/zPvyP9NEGN2mzF2LG8fqrE+OvNmYLKlXvGBwNnENjzMSjqy7C1c1kwOzA f16ueh0da6z7leFD/Mm/hNl2wuyCrASKEBsgFidL3TeS8zDOnOsfmwBHW3k4sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752504388; a=rsa-sha256; cv=none; b=M5XvSDJuudQV2QpdtUz3s645smYOde6KhL6f8axCGN7Oo49Ow4WYQhoDx0nE6VK4Mqv45o trmFfgKNHYwfIkcgFgH8wDsepKYJP1lOAgmqeqRvl21vmPTIfYd4Gq3rs/Pf19IB44zEgn zNdQfaRyWGPqPaLRhHVgVfOyVb9o6zaZhm0lqNtUXZPa8jYvsmgdGfaGxTOM0p+Mfnj1YB j8uRp7fdsKOgzdkMu2V754KS1TWdZYWl+l8DPJxRP8aLg3Scl7NTn7dLjkYwkrUsoEWZ7h F2JB6zkWBy74o0tJ6tkV1kaCUXxsPxb75zg79gjWrVnDMRbucAPJPyzWHbPgRw== 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 4bglWR6nZfzyPC; Mon, 14 Jul 2025 14:46:27 +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 56EEkRUO038094; Mon, 14 Jul 2025 14:46:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EEkRhm038091; Mon, 14 Jul 2025 14:46:27 GMT (envelope-from git) Date: Mon, 14 Jul 2025 14:46:27 GMT Message-Id: <202507141446.56EEkRhm038091@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1cc020eba69e - main - ncurses: Provide reproducible paths 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1cc020eba69e8c3216683b41487600c6c958cbb0 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1cc020eba69e8c3216683b41487600c6c958cbb0 commit 1cc020eba69e8c3216683b41487600c6c958cbb0 Author: Mark Johnston AuthorDate: 2025-07-14 14:45:57 +0000 Commit: Mark Johnston CommitDate: 2025-07-14 14:45:57 +0000 ncurses: Provide reproducible paths Avoid hard-coding the value of SRCTOP in generated files. Use /usr/src as the canonical srcdir. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50955 --- lib/ncurses/tinfo/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile index 920bd6e5559c..476df54bb72a 100644 --- a/lib/ncurses/tinfo/Makefile +++ b/lib/ncurses/tinfo/Makefile @@ -259,10 +259,18 @@ term.h: MKterm.h.awk edit_cfg.sh Caps Caps-ncurses sh ${NCURSES_DIR}/include/edit_cfg.sh ${NCURSES_CFG_H} $@.new mv -f $@.new $@ +# Avoid hard-coding absolute source paths if requested. +.if ${MK_REPRODUCIBLE_BUILD} != "no" +NCURSES_SRCTOP=/usr/src +.else +NCURSES_SRCTOP=${SRCTOP} +.endif + curses.h: curses.head MKkey_defs.sh Caps Caps-ncurses cat curses.head > $@.new AWK=${AWK} _POSIX2_VERSION=199209 sh ${NCURSES_DIR}/include/MKkey_defs.sh \ ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses >> $@.new + sed -i '' 's|${SRCTOP}|${NCURSES_SRCTOP}|g' $@.new cat ${NCURSES_DIR}/include/curses.wide >> $@.new cat ${NCURSES_DIR}/include/curses.tail >> $@.new mv -f $@.new $@ @@ -387,6 +395,7 @@ unctrl.h: unctrl.h.in terminfo.5: MKterminfo.sh terminfo.head Caps sh ${NCURSES_DIR}/man/MKterminfo.sh ${NCURSES_DIR}/man/terminfo.head \ ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/man/terminfo.tail >$@ + sed -i '' 's|${SRCTOP}|${NCURSES_SRCTOP}|g' $@ CLEANFILES+= terminfo.5 From nobody Mon Jul 14 15:02:53 2025 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 4bgltP6C7bz61r8s; Mon, 14 Jul 2025 15:02: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgltP1gbgz4Kdw; Mon, 14 Jul 2025 15:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752505373; 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=wwT1htvBbRb05wiLhPiihGEeuPmp9InXAqzv5M0WYmc=; b=CMQ1t65Wff1wsxHSy6cOYApYTcQrw4318ZQSO8XFEUNe/+fKp2JDkDtdVu9Jczw4hAkC8U 3puvklC/98avY96ZUeGvAXGFwwcwwCqWRLUDyfDXS/co5i/Zx0Gopfv1KwMvS/js8Ix6nu QJXjWtJiGO+sV/QXuGMDfeESmwN0IkJc3kiA0Dj5M0mDPcOPcvhAwsFZBzP9FNGtpylnhX ETY4AteHSPEE4ELwObjRVgMNlckWjQggA0sN1XdMIgB2IRGInzEvX/oWhCEMHJcbsSoDSI aSFEYcsG7b9VZHi4Rrrs15HX9doP7gxrXfcAL2589mJonWmDoymJi93UvdgvhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752505373; 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=wwT1htvBbRb05wiLhPiihGEeuPmp9InXAqzv5M0WYmc=; b=mSadjz+gbYJMGxRj2DVXWHJSvSec0bfm38pIJNN5rveWnBZ8fKK6RoZTtKeqA7dRlNWLgn p/cGDy9AxT3g36VZvknOD5k+DJbjLWBxkkh3ikIUb3rBnBkVsp6Lhucagq9/ZDyDdDfJhH H2LXKGnzlLDR2UhM/pM7qnKVnQ54DWMHD9OJa0qXFxd+RtVzBzTb+ONxKy2sSWhMTP5ONS wIydobGyfp9f0t1eGyJk6bVO5QMUK2EUrSlbrrz7uWDZ6dFgpsd9DgPoK4dGXlpcBjS0Y3 9agxq/6k8iRQ9ToYIewE1SbX6T7CW/AWqh+AHq1q8fVpoyWt/Jq0OnJMhVvBrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752505373; a=rsa-sha256; cv=none; b=GSfyhPC6+3p59IQT1KzMqVJm0Lco40ll5V/leBbSvc9EZtBCtM3SOI3x2DYCjhbkAXuqH5 ROWvsO6TAPFLmpqqpGpF6RMpIicRYyREGdAyzBK4hNykd77V1FL47PIlSKr04+NdP4S0t0 uPKcGbsH9BkyPhxNTQ+cXp3XWULNdLD9+Mqln3HZ1Sjy29qTf/karoFbz+7qmz0qTtGAiD rm5OvPxWOah+vIKzQ+rptjTfPnFIaHzU8QMV3fPCTNxrQ/TnUhxo/7iS82lUvFfvqb8Fet G9YjSpap9feSkzbTXn0y/y2VqQ8lgaXtnfKvr+FRutO0Xbjhwt3aPKF8SGGWsQ== 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 4bgltP15PKz101n; Mon, 14 Jul 2025 15:02:53 +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 56EF2r0s075523; Mon, 14 Jul 2025 15:02:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EF2rSK075520; Mon, 14 Jul 2025 15:02:53 GMT (envelope-from git) Date: Mon, 14 Jul 2025 15:02:53 GMT Message-Id: <202507141502.56EF2rSK075520@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7442cdca51fa - main - i386: Unhook all kernel configs from make universe 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7442cdca51fac3416cd6e2d1944158add17e65de Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7442cdca51fac3416cd6e2d1944158add17e65de commit 7442cdca51fac3416cd6e2d1944158add17e65de Author: John Baldwin AuthorDate: 2025-07-14 15:00:10 +0000 Commit: John Baldwin CommitDate: 2025-07-14 15:00:10 +0000 i386: Unhook all kernel configs from make universe This effectively makes i386 a world-only target in make universe. Reviewed by: bz, imp Differential Revision: https://reviews.freebsd.org/D51193 --- sys/i386/conf/GENERIC | 2 ++ sys/i386/conf/GENERIC-NODEBUG | 2 ++ sys/i386/conf/LINT | 1 + sys/i386/conf/MINIMAL | 2 ++ sys/i386/conf/PAE | 2 ++ 5 files changed, 9 insertions(+) diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index e7d460af21d4..f577cd07ac7c 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -17,6 +17,8 @@ # in NOTES. # +#NO_UNIVERSE + cpu I486_CPU cpu I586_CPU cpu I686_CPU diff --git a/sys/i386/conf/GENERIC-NODEBUG b/sys/i386/conf/GENERIC-NODEBUG index ea07613a796f..a93304481b5f 100644 --- a/sys/i386/conf/GENERIC-NODEBUG +++ b/sys/i386/conf/GENERIC-NODEBUG @@ -25,6 +25,8 @@ # in NOTES. # +#NO_UNIVERSE + include GENERIC include "std.nodebug" diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 41207eb63cb9..2e947202f723 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -1,3 +1,4 @@ +#NO_UNIVERSE include "../../conf/NOTES" include "../../x86/conf/NOTES" diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index 2a06eb84bff8..8019617ca4d4 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -31,6 +31,8 @@ # in NOTES. # +#NO_UNIVERSE + cpu I486_CPU cpu I586_CPU cpu I686_CPU diff --git a/sys/i386/conf/PAE b/sys/i386/conf/PAE index a39d32d77106..72af9e9a9eec 100644 --- a/sys/i386/conf/PAE +++ b/sys/i386/conf/PAE @@ -2,6 +2,8 @@ # PAE -- Generic kernel configuration file for FreeBSD/i386 PAE # +#NO_UNIVERSE + include GENERIC ident PAE-GENERIC From nobody Mon Jul 14 15:02:55 2025 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 4bgltS1GJtz61rjH; Mon, 14 Jul 2025 15:02:56 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgltR3Wzmz4Kkd; Mon, 14 Jul 2025 15:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752505375; 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=aLoLRQR+tkzq4KC/WC7iCNxeLLzIiN3RkncXES8zEH0=; b=OnkoWQS1mhXp+C5lCbfqjYQBNiAqBXpXIJrIU0uvRbQf1Bu6ue61Jzc1iq5/AjLNDAC2KY 8EVyIOs8ZAbSAbBV+l6+EIdYlC9sk/l3WN6AkuOMvPUCqaYYsww6WS2CsOtGqgw71LRvh1 m88dVeMJCLzd3v81yRNUTXCEHDtNiCFI8zeu9GtKaq/g2FaYm6sY3qcZO2HBg5NAU7JJVi cHhdM+tmsZXdyUdo3ll8Sq457xBYUP+YxJWsM1BJ/QMFaLJ9A/M5iUNaIJPExcnqOmggxg 6FYGZCjKfm6oOKHTqMfjRSkaFNiEumY/56EVzg7lNUYkhBG0efB3lbes50YVCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752505375; 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=aLoLRQR+tkzq4KC/WC7iCNxeLLzIiN3RkncXES8zEH0=; b=UGqZXizst9I7WmxMlYF/kDBmC6DEl8yILMgECtZMYSeXUFLaxmrf4rp3iSAqoi0kMN5S34 Y9CNV0jBfspzkiBHQqEzB4CB9SK08G844nqSzLyCd4OsADxmh2KzoJ1OGSct38vs78G2Xx a4GqduD/CMLLchdtcywJc6wZeYbOQ1jizQgubJrZu3aUiI4aGbmLsXj3fN8hJJMAYttmXV Z2R5vBKx9zXmqDVMMmepr9tGycUknuH3GFoR/uCKK9e4NbLtEmQecxh7eHvYfyhaoEg4m6 1Syj1XwLh7zxjOGlC36shbi4FMN7smBrWWkLRFnilmfHXq4W/BOmhH+M8Z5wyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752505375; a=rsa-sha256; cv=none; b=VeYWpDXnFrr5mMD3ywpVht1bpw/QZZGORSf9e7eSbE8hdtZO1MFMjpC2fc0Ti53weh0ygy uwaoJNALVSpT89Y2Xwbx7FbI45gyFC0kJL4SuKM+Ylkb791y+2zgTK7YctZXY42z0G2eWA +NtTEgq5YfZ76jcpkr+bVSjqm5SiQmfAb7QeT2HoYLwpZ3uCXgmauR7B5a+AsAX7iD8lQg uZzBqFeTxB+fsXtK8PdgmicoxMeXC+/5LBDtmihCeDJ1djJIPC4+jeDO6nn7x8ASVAt/la c2nLdEQ0vJXWcQHD9B5UXV3qifAdeAOyyJMymhb5zFzL5q7KbQDssksO7fCfLw== 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 4bgltR30bRzync; Mon, 14 Jul 2025 15:02:55 +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 56EF2tYA075599; Mon, 14 Jul 2025 15:02:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EF2t88075596; Mon, 14 Jul 2025 15:02:55 GMT (envelope-from git) Date: Mon, 14 Jul 2025 15:02:55 GMT Message-Id: <202507141502.56EF2t88075596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 072f54bf9ff3 - main - arch.7: Move i386, powerpc, and powerpcspe to the discontinued arch list 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 072f54bf9ff3fb544ae65649e723d5f846b53897 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=072f54bf9ff3fb544ae65649e723d5f846b53897 commit 072f54bf9ff3fb544ae65649e723d5f846b53897 Author: John Baldwin AuthorDate: 2025-07-14 15:01:30 +0000 Commit: John Baldwin CommitDate: 2025-07-14 15:01:30 +0000 arch.7: Move i386, powerpc, and powerpcspe to the discontinued arch list Other tables retain entries about these architectures since those details are still relevant for lib32 environments. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D51195 --- share/man/man7/arch.7 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/share/man/man7/arch.7 b/share/man/man7/arch.7 index 91f6953370d9..918f9058c7aa 100644 --- a/share/man/man7/arch.7 +++ b/share/man/man7/arch.7 @@ -67,8 +67,7 @@ and should be avoided. .Pp On some architectures, e.g., -.Dv powerpc -and AIM variants of +AIM variants of .Dv powerpc64 , the kernel uses a separate address space. On other architectures, kernel and a user mode process share a @@ -88,9 +87,6 @@ release to support each architecture. .It aarch64 Ta 11.0 .It amd64 Ta 5.1 .It armv7 Ta 12.0 -.It i386 Ta 1.0 -.It powerpc Ta 6.0 -.It powerpcspe Ta 12.0 .It powerpc64 Ta 9.0 .It powerpc64le Ta 13.0 .It riscv64 Ta 12.0 @@ -104,6 +100,7 @@ Discontinued architectures are shown in the following table. .It armeb Ta 8.0 Ta 11.4 .It armv6 Ta 10.0 Ta 14.x .It ia64 Ta 5.0 Ta 10.4 +.It i386 Ta 1.0 Ta 14.x .It mips Ta 8.0 Ta 13.5 .It mipsel Ta 9.0 Ta 13.5 .It mipselhf Ta 12.0 Ta 13.5 @@ -114,6 +111,8 @@ Discontinued architectures are shown in the following table. .It mips64elhf Ta 12.0 Ta 13.5 .It mips64hf Ta 12.0 Ta 13.5 .It pc98 Ta 2.2 Ta 11.4 +.It powerpc Ta 6.0 Ta 14.x +.It powerpcspe Ta 12.0 Ta 14.x .It riscv64sf Ta 12.0 Ta 13.5 .It sparc64 Ta 5.0 Ta 12.4 .El From nobody Mon Jul 14 15:02:54 2025 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 4bgltQ5NGvz61rJq; Mon, 14 Jul 2025 15:02:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgltQ2W2hz4Kf0; Mon, 14 Jul 2025 15:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752505374; 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=8uLzGyPQ2JJrGiV0ur6LIKxAotQA5kE1AaRdCBjrJAg=; b=mcEyrOb3FGniMRlpjfA8CvEK9OWabBLQDI4ID6kVt1xSr2s2kALnsGtPLyuIl7/kDLEfGa EKkJdOyBQB6O9pC7l3+yZo3Y0WqYM1g/5A8cHhD1S0JQ+Y50BaXyXtcZRi0SqHExdyPH7C KoKpi2xlSmtsLrzqGpnCY4WsYydV0mosq5U+AObXiqEm68O6BuEvgjpV8amyWRgYNfF+mB 69Hoo5LG71F5B1UBW+nTOdi7bmlbFaGNCeDk9XXpEU8oei5vOeqvniM/65zULdmoK+pumT MKju2CChdIVogkjDeXOVEc3aCmfiN5OX8nnUwjyVWcItorKao+2bO2J+r5b0qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752505374; 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=8uLzGyPQ2JJrGiV0ur6LIKxAotQA5kE1AaRdCBjrJAg=; b=El7XLv9C6fsOOaIjM5VdORrZPA96gzVP6Y+BZEoMIzQaBbcYzOXWk7HW+7/g0dZPhycT// z1chW7dk4rmKo+dOaWXG8SCm61SLCRg0nsvqnbnmrKI/uhg1JtXzD2jx1H+ILGCdTQTANd Y+vZId119tF+dHIc3ZplS5uiKIJW/MsNGYtsxRkHdV6yVHP+9T0jD2a03vc3sFb2pwhuZk zkjRvT5Qn+vZ3v8DA00AkDXFUhHc7faFPnOZYny075kqo4zUTfe0hXd+bDWNI/gGj+fo9q cibWqv6ocAtTGkCE7ncq3GJESqkYhcraOyve6XYcbQBcWrQfmJ0jU/xU9t2Uow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752505374; a=rsa-sha256; cv=none; b=bK2Jo4uqJaNjl9ovF0fpIYLKLLutvhUeBzSlOkhqPobgbNVyC7Ie47NS4vkWwd0w3IPrwK UHNhIXdnRrgZaqlyNuPhcNl+iNAcGMHhOyp9b8PUMph+VgdWoW1nbGXPcG8Oa7WeyTjSu7 oxynFIfnin+h7MbMCXsZD+5mHN3lvIo2bDg5sIflu/PMPzU93EBQzYalHzFDuL/oyEO710 dnB+tmqJD6ONlP+L7bKDxEQQCxQLA+xFnAqp+DLLrcmfpCK2fbTyqlOf2oxJfBxiDtLdvX 8NfqzPRYCv+q58dZW2A3Mt0+54Mtitfu/3qZBU2nNGDeRCqDNqiFUIHQXvRjow== 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 4bgltQ20K1z101p; Mon, 14 Jul 2025 15:02:54 +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 56EF2s5N075565; Mon, 14 Jul 2025 15:02:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EF2s0p075563; Mon, 14 Jul 2025 15:02:54 GMT (envelope-from git) Date: Mon, 14 Jul 2025 15:02:54 GMT Message-Id: <202507141502.56EF2s0p075563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4a3fb7547e6b - main - powerpc: Disconnect 32-bit powerpc from make universe 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a3fb7547e6bbae48e6535f22752486769df7272 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4a3fb7547e6bbae48e6535f22752486769df7272 commit 4a3fb7547e6bbae48e6535f22752486769df7272 Author: John Baldwin AuthorDate: 2025-07-14 15:01:09 +0000 Commit: John Baldwin CommitDate: 2025-07-14 15:01:09 +0000 powerpc: Disconnect 32-bit powerpc from make universe World and kernels for 32-bit powerpc can still be built using the buildworld and buildkernel targets. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D51194 --- Makefile | 8 +++----- share/mk/local.sys.machine.mk | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 4afec2a80c60..383430307495 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,7 @@ # # See src/UPDATING `COMMON ITEMS' for more complete information. # -# If TARGET=machine (e.g. powerpc, arm64, ...) is specified you can +# If TARGET=machine (e.g. powerpc64, arm64, ...) is specified you can # cross build world for other machine types using the buildworld target, # and once the world is built you can cross build a kernel using the # buildkernel target. @@ -530,8 +530,7 @@ worlds: .PHONY # Don't build rarely used, semi-supported architectures unless requested. # .if defined(EXTRA_TARGETS) -# powerpcspe excluded from main list until clang fixed -EXTRA_ARCHES_powerpc= powerpcspe +EXTRA_ARCHES_powerpc= powerpc powerpcspe .endif TARGETS?= ${TARGET_MACHINE_LIST} _UNIVERSE_TARGETS= ${TARGETS} @@ -546,8 +545,7 @@ TOOLCHAINS_amd64= amd64-${_GCC_VERSION} TOOLCHAINS_arm= armv7-${_GCC_VERSION} TOOLCHAINS_arm64= aarch64-${_GCC_VERSION} TOOLCHAINS_i386= i386-${_GCC_VERSION} -TOOLCHAINS_powerpc= powerpc-${_GCC_VERSION} powerpc64-${_GCC_VERSION} -TOOLCHAIN_powerpc64= powerpc64-${_GCC_VERSION} +TOOLCHAINS_powerpc= powerpc64-${_GCC_VERSION} TOOLCHAINS_riscv= riscv64-${_GCC_VERSION} .endif diff --git a/share/mk/local.sys.machine.mk b/share/mk/local.sys.machine.mk index 5e40dfe805f9..e1a197e516e5 100644 --- a/share/mk/local.sys.machine.mk +++ b/share/mk/local.sys.machine.mk @@ -9,7 +9,7 @@ MACHINE_ARCH_host32?= ${_HOST_ARCH32} MACHINE_ARCH_LIST_arm?= armv7 ${EXTRA_ARCHES_arm} MACHINE_ARCH_LIST_arm64?= aarch64 -MACHINE_ARCH_LIST_powerpc?= powerpc powerpc64 powerpc64le ${EXTRA_ARCHES_powerpc} +MACHINE_ARCH_LIST_powerpc?= powerpc64 powerpc64le ${EXTRA_ARCHES_powerpc} MACHINE_ARCH_LIST_riscv?= riscv64 .for m in ${TARGET_MACHINE_LIST} From nobody Mon Jul 14 15:02:56 2025 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 4bgltT19k3z61rcs; Mon, 14 Jul 2025 15:02:57 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgltS4C73z4Kf2; Mon, 14 Jul 2025 15:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752505376; 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=J6SW4knS54rkxRrXRIxgY6+Qhu7wdWNVpusRdhr/Wk0=; b=VYGEFrdkqqsLVUMYDIz+CD41B/UGWQVmLPFxfee1O/nWd91AUz+WlZvy+gkElU3Bl9S1qL BVmVzDLIvD85tCI/AZG2EU4iko233seod0c2rbnKzBv/y6HiGQ+jJebgSpqXCD8ewD9ldT FjLYQJI+oIxk1btOZjiKRRzpzJTznGDQKQPm+1BWKWcbTVm7ml3qmrjnP5/TnTiqq/PnMn lgzg34JPePE9inUsbqoxVLGcM7gBoM+3deryZzJkg21YyEw+2eXOzN8j66wSt9WBy1PTkK gftKXxd2ndglmgYZkfnXsTnzK+8LglaTLm2Efa73HfNRGcvVKJhg/CrjNRR/Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752505376; 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=J6SW4knS54rkxRrXRIxgY6+Qhu7wdWNVpusRdhr/Wk0=; b=ievLglxBYMUf5H83wByWkaVmy9En2mWWIUSaylAO+R2xkPPg4Ayhfv4vERXvcRFjIICz4X nYhUnmKSd0CO2XAQbownAtM10kLvLjm1XNVa5y0Z7Y92pntk+jZibMzwX6hYH2LHeIh+fF mmBTZtU54eUdwXgFlgHYrrsF1SPg/qhdDql7yauyducHjlAfXPbo9CBA0s7vSkN8qRARPh 1+mvGATR5ZSiLMhPAGQiWOgde8hVSSuxIHlwep7PZ2Ga2kcUQwlxVvdBBfBIacb28kmTvp l90hzXYacRT9dqyGnIgbHF48EJBvTE3jaQJgQ1Hbpu08A9DG9iF9wDzUgQMBxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752505376; a=rsa-sha256; cv=none; b=kJzY4Yv1gIq+9sQztXp0VdPcWEF6EO/gfipmzIc8VfuMw+rsOWwbovhEjZeJs4pwzqKV/T 73ygef0H5O80xZhrZJuJeIqU8SyM7Q/7ZhRVNGTa79qUQ7XzIifs/ENq1zbr15tTM1ukgx QPVIVRWOblkZeymLeqDYrR1uSVyobS9AyHBILnpY1Jsrzf9ir6Dq53JOMf3XpSdbfPVraS voIMTEBF7SUi+6wOFghQTpEcoAbjz2Xyc4jaNiH2s7XKb76hnODoTKDp/zYbvEt/dmPzGj 1FwYTqeIqZhji/r85XXaLsAqZ0HafnsXnnE3uRuRwEGfKpbmChrmbcyAz8s3Bg== 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 4bgltS3gM5zywQ; Mon, 14 Jul 2025 15:02:56 +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 56EF2urm075634; Mon, 14 Jul 2025 15:02:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EF2uXj075631; Mon, 14 Jul 2025 15:02:56 GMT (envelope-from git) Date: Mon, 14 Jul 2025 15:02:56 GMT Message-Id: <202507141502.56EF2uXj075631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0d0d6378add2 - main - Remove stale reference to EXTRA_ARCHES_arm 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d0d6378add20d859a92a1eb3fa8b15f47806efe Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0d0d6378add20d859a92a1eb3fa8b15f47806efe commit 0d0d6378add20d859a92a1eb3fa8b15f47806efe Author: John Baldwin AuthorDate: 2025-07-14 15:02:15 +0000 Commit: John Baldwin CommitDate: 2025-07-14 15:02:15 +0000 Remove stale reference to EXTRA_ARCHES_arm Fixes: 7818c2d37c2c ("armv6: Remove support for building armv6") --- share/mk/local.sys.machine.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/local.sys.machine.mk b/share/mk/local.sys.machine.mk index e1a197e516e5..961362cb048a 100644 --- a/share/mk/local.sys.machine.mk +++ b/share/mk/local.sys.machine.mk @@ -7,7 +7,7 @@ TARGET_MACHINE_LIST?= amd64 arm arm64 i386 powerpc riscv MACHINE_ARCH_host?= ${_HOST_ARCH} MACHINE_ARCH_host32?= ${_HOST_ARCH32} -MACHINE_ARCH_LIST_arm?= armv7 ${EXTRA_ARCHES_arm} +MACHINE_ARCH_LIST_arm?= armv7 MACHINE_ARCH_LIST_arm64?= aarch64 MACHINE_ARCH_LIST_powerpc?= powerpc64 powerpc64le ${EXTRA_ARCHES_powerpc} MACHINE_ARCH_LIST_riscv?= riscv64 From nobody Mon Jul 14 16:36:33 2025 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 4bgnyT2jkzz61xFh; Mon, 14 Jul 2025 16:36:33 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgnyT1SSfz41Gh; Mon, 14 Jul 2025 16:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752510993; 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=k5TUfC3QeN1W5Ka974YaeeoPkh/x4dO0tZs0y2eEOpU=; b=mGPv0Bgip9+sBIYEA8tKCCoruz+UxHJ5jrFNdzulLINUTXo7ZyDIJS99ccOgL0dNjtXzDz TorP8/y7KFGmF3eIUSwYYR2fX9NogNkJdy9fgdZgzqnpqqAQt34sn8gG4f+GD/nZ5hcwYV pQERjbTp5+LeD7n31K/uO+u82ixrpcyPK6bjQv9kL5HDH+ucdzr1z/H/IiYdEiLIAadxCa iz2Bewj2KFNPOYXjILp4EOK5dSf9CQBJb92DoaVUxnCqP0bLpvdRcJO93bvDR/SYiCV9zY g//v0eTTWUw0U3jNrjLF+AwmKdP41XRN0q3f2uX3p76mNpruO6dErm3s9Z+Y7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752510993; 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=k5TUfC3QeN1W5Ka974YaeeoPkh/x4dO0tZs0y2eEOpU=; b=Kj8v1vEMWNNEnxI3ZYMel2qzpyDXc/Mgyd0O30PV2SUURCqhmvY3ton/btUYP6sqsF9ikF lc3L2s3QWSeOsCNv0FtN73/Rd8vnX5dbDPZLCQ8LEKNJcSy3onZRXRRlXtQkViR49gaZp7 GkNwaZrn3+AlkqRKnd66Wsf0vSJqYb6k8l8PtSxoZAWihl2nCNHSdXPyQX3cl4OWEljKpn hdxI9qqYji39npgkqy9UlUY2ctn94YT8GkdCZYhWOk+lJOb5AzCPNbqUHm/3bIhu+gLPTu 1r1s+0aWpQcGFF6GImP1lFQqj+ya5/UjfWXmlmbAVI0ppujrUHCI3LLSpjwoyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752510993; a=rsa-sha256; cv=none; b=cXtuvujbCEZZzHsaIOVKBIT1WC4L+7IXlW/tn10bALRCLwRuVxxYqgu3E0J0ZUAS2mfhW+ ZF6oaWhYniOEd7zcrFj5W7GBkbsIGwol4GM5uiHOTNITkxbAnJEr00mVaKJbvZKfOzsbqU WdR2cR4inFAdHlqfL5CNhOZ6nJfStICgGpTzOTyrFF6NR+cYRPXJ0exkaE9AgvtOPEEujL uAZghwh0Efn61/o2ATI2Ko5KKZKYDAPnBgQDDxIRaLXC2HHUmp2RhWyLgLOemVsBetGAqX a2/NerdSYxCCswW5/478Jp1U3MpVQ5fj3HuNxxKTsHAnW3UlctMmV9DZjL/ruw== 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 4bgnyT0dMdz12Nt; Mon, 14 Jul 2025 16:36:33 +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 56EGaXpG045528; Mon, 14 Jul 2025 16:36:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EGaX8G045525; Mon, 14 Jul 2025 16:36:33 GMT (envelope-from git) Date: Mon, 14 Jul 2025 16:36:33 GMT Message-Id: <202507141636.56EGaX8G045525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 46efd2ceca73 - main - dtrace_profile.4: Document the DTrace profile provider 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46efd2ceca736a20f06a730921574065047c01fe Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=46efd2ceca736a20f06a730921574065047c01fe commit 46efd2ceca736a20f06a730921574065047c01fe Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-07-12 13:49:11 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-07-14 16:35:01 +0000 dtrace_profile.4: Document the DTrace profile provider Event: Berlin Hackathon 202507 Reviewed by: bcr, christos Relnotes: yes Differential Revision: https://reviews.freebsd.org/D51278 --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 1 + share/man/man4/Makefile | 1 + share/man/man4/dtrace_profile.4 | 129 +++++++++++++++++++++++++++ 3 files changed, 131 insertions(+) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index f3d7a49e0e78..bcd23c1789be 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -1229,6 +1229,7 @@ Invalid command line options or arguments were specified. .Xr dtrace_kinst 4 , .Xr dtrace_lockstat 4 , .Xr dtrace_proc 4 , +.Xr dtrace_profile 4 , .Xr dtrace_sched 4 , .Xr dtrace_sctp 4 , .Xr dtrace_tcp 4 , diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 5648fd2c1a84..5e60f00bc09f 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -986,6 +986,7 @@ _dtrace_provs= dtrace_audit.4 \ dtrace_kinst.4 \ dtrace_lockstat.4 \ dtrace_proc.4 \ + dtrace_profile.4 \ dtrace_sched.4 \ dtrace_sctp.4 \ dtrace_tcp.4 \ diff --git a/share/man/man4/dtrace_profile.4 b/share/man/man4/dtrace_profile.4 new file mode 100644 index 000000000000..07f86663d60a --- /dev/null +++ b/share/man/man4/dtrace_profile.4 @@ -0,0 +1,129 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.Dd July 14, 2025 +.Dt DTRACE_PROFILE 4 +.Os +.Sh NAME +.Nm dtrace_profile +.Nd a DTrace provider for firing probes at a given time interval +.Sh SYNOPSIS +.Nm profile Ns Cm :::profile- Ns Ar rate Ns Op Ar unit +.Nm profile Ns Cm :::tick- Ns Ar rate Ns Op Ar unit +.Sh DESCRIPTION +The +.Nm profile +provider implements three special probes related to the life cycle of the +DTrace program itself. +.Ss Probes +The +.Nm profile Ns Cm :::profile +probes fire on all CPUs and are suitable for measuring the whole system +periodically. +.Pp +The +.Nm profile Ns Cm :::tick +probes fire on a single CPU, potentially a different one every time. +They are useful, e.g., for printing partial results periodically. +.Ss Rate and Time Units +The +.Nm profile +provider probes will fire at the specified +.Ar rate . +.Pp +The default unit is +.Cm hz . +The +.Nm profile +provider supports the following time units: +.Bl -column -offset indent "ns, nsec" "Definition" +.It Sy Time Unit Ta Sy Definition +.It Cm ns , nsec Ta nanoseconds +.It Cm us , usec Ta microseconds +.It Cm ms , msec Ta milliseconds +.It Cm s , sec Ta seconds +.It Cm m , min Ta minutes +.It Cm h , hour Ta hours +.It Cm d , day Ta days +.It Cm hz Ta Hertz (frequency per second) +.El +.Ss Probe Arguments +The arguments of the +.Nm profile +provider probes +are: +.Bl -tag -width arg0 +.It Va arg0 +The PC (program counter) in the kernel when the probe triggered, +or 0 if the process was not in the kernel at that time. +.It Va arg1 +The PC in the user process when the probe triggered, +or 0 if the process was in the kernel when the probe triggered. +.El +.Pp +Use arguments +.Va arg0 +and +.Va arg1 +to tell if the +.Nm profile +provider probe fired in the kernel or in the userspace context. +.Sh IMPLEMENTATION NOTES +The +.Xr sysctl 8 +variable +.Va kern.dtrace.profile.aframes +controls the number of skipped artificial frames for +the +.Nm profile +provider. +.Sh EXAMPLES +.Ss Example 1 : Profiling On-CPU Kernel Stack Traces +The following DTrace one-liner uses the +.Nm profile +provider to collect stack traces over 60 seconds. +.\" XXX: Keep on one line for easier copy-pasting. +.Bd -literal -offset indent +dtrace -x stackframes=100 -n 'profile-197 /arg0/ {@[stack()] = count();} tick-60s {exit(0);} +.Ed +.Pp +The system is profiled at the 197 Hz to avoid sampling in lockstep +with other periodic activities. +This unnatural frequency minimizes the chance of overlapping with other events. +.Pp +Option +.Fl x Cm stackframes=100 +increases the maximum number of kernel stack frames to unwind during +.Fn stack . +.Pp +Checking if +.Ar arg0 +is not zero makes sure that profiling happens +when the program is in the kernel context. +.Pp +Refer to +.Lk https://www.brendangregg.com/flamegraphs.html +to learn about generating flame graphs from the obtained stack traces. +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr tracing 7 +.Rs +.%B The illumos Dynamic Tracing Guide +.%O Chapter profile Provider +.%D 2008 +.%U https://www.illumos.org/books/dtrace/chp-profile.html +.Re +.Rs +.%A Brendan Gregg +.%A Jim Mauro +.%B DTrace: Dynamic Tracing in Oracle Solaris, Mac OS X and FreeBSD +.%I Prentice Hall +.%P pp. 24\(en25 +.%D 2011 +.%U https://www.brendangregg.com/dtracebook/ +.Re +.Sh AUTHORS +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . From nobody Mon Jul 14 16:40:08 2025 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 4bgp2c4w5Zz61xNf; Mon, 14 Jul 2025 16:40:08 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgp2c44rgz43gh; Mon, 14 Jul 2025 16:40:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752511208; 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=JXk8meGUWqUxW8hKawe1Kc/i3b7g5N9234CbHUBgPMk=; b=oJQHXuSPviVMEiXwBVWPC5zB/kic5aM09HgPVAIbM/LXfZKq3ZEgyFA1MzTd2sok2CndNe fGv/EnESa0QWj2kwMkl5IwwtxN4LfPohaKtanUxJdyockUl8TpH305g7ryBQ6t2Ysda0lO rjljh9sZYcf+bfSUu+gG1unnk3+rrI2O5PHuzWWBSPerxY2VajvalnJVpZtL0IcFJs/ael S/omlY0NeWn3oKK8yZJ1LfgBW1UJXJ9qOVRmuXrOleCleuaty6po1/8Nbtt3PCALzkctMq roqKf7xmQTnQGO89n0WGtN9m/bfX34bkR+ppl3xuVty8kyL8HaxC4q2OIa/9QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752511208; 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=JXk8meGUWqUxW8hKawe1Kc/i3b7g5N9234CbHUBgPMk=; b=jOD1GtvBxwANOpjCD7HPvEAcRNh1xZE1fIF/+xwjhHA0X75GUOckec0n6ZX1MWkhk8vsRr HQWwOn7TQPgTQ3l8LNd5Z9zxHtM8fA4kitchb5jkqpF0yMqKUm4n9/6GEneuXh0DsubISJ ZrA3t9iMd6kJF4NWqUPVAfEzP6cW+hjHOrCRH/mKV8AMMLb8Ux9g7U0mHOV37SGuHPIDKl ONR72pRJO5BGkRHe+5eid7u+7NCL13jFes9s86pf6YSs+8S10crFYjsCkmFfFLBQZSC26m 9tEBQS+Z81Xnld7AOQdcpZJiPEp2GdiKPrfxZyru+r8YJ4d6Gj83VY6/I014+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752511208; a=rsa-sha256; cv=none; b=snS3TOrkvJp+ssODC1J22T3R4OB8FF/zne6VVGGBaKLP6DAYKkb1JJNuak369jx5XWGP2A XCMtWz8VodmvkGsmN8cx4rqhu7O8QQNLYPXjzHC0vSvtBPHzQK1rffuHolFs2pBfrgc8c6 XklqLOvOR8/Sn9/ZcjRMjSj7CUjXSo5jweJKXk/GRxm5Yxsio8l5K4DPqcPPMMnI1frtPP ipdfbAKyMRqpqsgwek0viUt8tj0TDLhpUUu5KckiAl1DyXywxgX29snxIyarY9mgr7RdKH x/imJAh2GDzc5kUH9tatU1QP9fGVqjfxDWYMDyeZo9my6BHQ0xrAZRkd1+bsVw== 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 4bgp2c3H8cz11xy; Mon, 14 Jul 2025 16:40:08 +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 56EGe8rq050097; Mon, 14 Jul 2025 16:40:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EGe8pM050093; Mon, 14 Jul 2025 16:40:08 GMT (envelope-from git) Date: Mon, 14 Jul 2025 16:40:08 GMT Message-Id: <202507141640.56EGe8pM050093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 1fe7af063581 - main - dtrace.1: Document evaltime 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1fe7af0635810a96a292638d11d25ddbe95bd581 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=1fe7af0635810a96a292638d11d25ddbe95bd581 commit 1fe7af0635810a96a292638d11d25ddbe95bd581 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-07-14 14:51:37 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-07-14 16:38:19 +0000 dtrace.1: Document evaltime Reviewed by: christos, ziaee MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51301 --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 48 +++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index bcd23c1789be..d44ee5023e78 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 14, 2025 +.Dd July 14, 2025 .Dt DTRACE 1 .Os .Sh NAME @@ -617,6 +617,52 @@ Same as the flag. .It Sy dynvarsize Ns = Ns Ar size Size of the dynamic variable space. +.Sm off +.It Sy evaltime = Cm exec | preinit | postinit | main +.Sm on +Process create mode. +When using +.Fl c Ar cmd +to start a command, +.Nm +will first stop the newly started +.Ar cmd , +evaluate the +.Xr d 7 +program, +and then resume the +.Ar cmd . +The +.Cm evaltime +option controls the exact moment when this happens. +.Pp +The following table describes supported modes. +.Bl -column -offset indent "postinit" "D Program Evaluation Time" +.It Sy Mode Ta Sy D Program Evaluation Time +.It Cm exec Ta +Right at the first instruction of the command +.Ar cmd +execution. +.It Cm preinit Ta +Before +.Xr elf 5 Ap s +.Dq .init +sections. +.It Cm postinit Ta +After +.Xr elf 5 Ap s +.Dq .init +sections. +Default on +.Fx . +.It Cm main Ta +Before the first instruction of the +.Fn main +function. +.El +.Pp +Usually, there is no reason to change the default mode, +but it might be handy in situations such as shared library tracing. .It Sy flowindent Turn on flow indentation. Same as the From nobody Mon Jul 14 16:42:28 2025 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 4bgp5K0lqlz61xRP; Mon, 14 Jul 2025 16:42:29 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgp5J6gN6z45dV; Mon, 14 Jul 2025 16:42:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752511348; 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=b7CpEeKp53vK3wzIgg6Rdw2CGYxxB7wbsd9fdeSvzZs=; b=pRSpIQQLa/fJvIiVhvbFcStK96z85jKoUGStubRRqk2BJfZdCg3JuWXm5zV410t5sB4k4E 1JwH0Rx2ENTGeY62ZE3Tz/akRhtE6gyo9uAdCFfqvXd2tnSuz1d108EjefObKbsBjiDd4Z wylgvkOiIO/S+FONP1oi+fwRmyIJtZHLYyvpQyKYwRg5NTZ3pxUC6EMsn3szerGtrw3Fda w/tRyGVQWHGljLfXp36gyFlHoaLh3QLF5ulPBPExe3sJeX8WwyrYTRJU0tlKbIDHH53Evg DcOTG6ouX4D/Z7yi3sORSTBM4C9vGX8PRFVGYiVAGvVrRD8yoqs1jtSYjIlPIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752511348; 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=b7CpEeKp53vK3wzIgg6Rdw2CGYxxB7wbsd9fdeSvzZs=; b=YRYm1kAXlQSQn3nqVPVCHD7p3t15gI3FfOWC9SP+YkTy21u7OzTqLWoufu4t8VA9irciNA EUKLiT6wxptH8hBwojE3ZtPu8BoG2iPdFvk3aHU2XjwWnGmeNe/JBFnq5NVvliS+wW5pul Rr5GfpNp0LBSqPwff8olAwgGycj3HcpV+vIi19LFp7TAZ1VkSMgbZjuXMuz7FWdH1NT2tk DF/Goc1H0eb1fgiDEx3sdU5r0BqvWqGcJmQZQlPYaLhg3rUNIRYjPkP5s0j7DZx5Rorc5d Vd0cw+i83FxbljFzp/Bbio6gScx7WEh/spZTAjQo7qoUcJGIu62R1FwZosHSIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752511348; a=rsa-sha256; cv=none; b=xQSmYASNJA+Wry4ZXij9nVLuEUvn8Yp9FZpQPiQi306z0uQNXvQbFf5gn3TFl9vYTWWZGH dr4T363Ucla/J/OBZFeuznpv7Q0mjcqyfwpaNKquC+m6We7emaFTbkGOMkEjeEVlgnV/dP 70YW4agBsmsky9JGD3mrFL+DdjLXUkd3+iBZ/INBTQ+3GyIxw7z4ama2ZVwNg/V+xJJbg7 gZey/AVdDvHgiB2Oamg4GxUZKYQqH0z8EOIAjP/06bhNj6q3rf/NuHU+xc93eW197/HZBC y9/Wz/utYhzoex8c7nD9HzJbprBjwiCCQ2KS8EkiyxKj9vjjw/oh2VlTvxrTKg== 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 4bgp5J6H3Vz1228; Mon, 14 Jul 2025 16:42:28 +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 56EGgSMQ063563; Mon, 14 Jul 2025 16:42:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EGgS2T063560; Mon, 14 Jul 2025 16:42:28 GMT (envelope-from git) Date: Mon, 14 Jul 2025 16:42:28 GMT Message-Id: <202507141642.56EGgS2T063560@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: ab9ee52e849c - main - tracing.7: Shorten doc description for apropos 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab9ee52e849c02cf905830d43f2153cdd9ca32bc Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=ab9ee52e849c02cf905830d43f2153cdd9ca32bc commit ab9ee52e849c02cf905830d43f2153cdd9ca32bc Author: Alexander Ziaee AuthorDate: 2025-07-14 16:40:34 +0000 Commit: Alexander Ziaee CommitDate: 2025-07-14 16:42:21 +0000 tracing.7: Shorten doc description for apropos Shorten document description to fit on one line for the beautification of apropos results, removing only the search keyword "facilities", which I think is unlikely to cause discoverability regression. MFC after: No (please mfc if mfc'ing tracing.7) Reviewed by: 0mp, bcr Differential Revision: https://reviews.freebsd.org/D51284 --- share/man/man7/tracing.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man7/tracing.7 b/share/man/man7/tracing.7 index f3e3a5bf98c4..7085bac78385 100644 --- a/share/man/man7/tracing.7 +++ b/share/man/man7/tracing.7 @@ -8,7 +8,7 @@ .Os .Sh NAME .Nm tracing -.Nd introduction to tracing and performance monitoring facilities on FreeBSD +.Nd introduction to FreeBSD tracing and performance monitoring .Sh DESCRIPTION .Fx features a large variety of tracing and performance monitoring facilities. From nobody Mon Jul 14 16:47:14 2025 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 4bgpBq18s4z61xMZ; Mon, 14 Jul 2025 16:47:15 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgpBp5Y9Wz485n; Mon, 14 Jul 2025 16:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752511634; 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=6HUeNo0Kob0KGQA96PNRhA0+PVOtgd93LamFE0sk6Ik=; b=T7A2A4yfvFrAOCIc69A0RpeSdQQZvvwVtERj5ybUEAQllcyMS/Vu5cJOY1gBknoe1tBpJO zvexxV5oA6F8ElRzKDyNWeGaeXJTSL4kx4wlxkI787doSv3Xf9YU/twUMNwpumVxrrgu6h i5HNNCW37rmDrGhIYuDVJvtUfqbKA9CRR5CVy634a4JPrSqw9DcTESFgKrY5HNUHptFRUu 5DA3wDjm++xYz3oM6Y1efakx0e1R/1DJ1kZcaMdVgMC1bG32VyAD8UawHizy7WLAm//G3l neCm3ixFw68oMa7NrrM5Y8HG2q1kzwWanKaZ/n6rdVgu84xE6BeGUG2ehPwwFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752511634; 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=6HUeNo0Kob0KGQA96PNRhA0+PVOtgd93LamFE0sk6Ik=; b=rRU00Fdj2QSKQRzzTIUwFnYiKgtMwnkU1f2Tr5AM7NbAkwKMPL0FAlPXy5HOP0KWgzVqk7 MdE/mDZ4P9Wm0yQjhJAutBK/mg6bLDzYTxs5nhNcViLFLxTK7GP5zFDa4Jlz9d6zjiXHPx YoIpyIBOYQY3jMO866vuWfMbKBq4aUGTVIeI0fgiK/E32slOEob/wcu5ICCYrNoOLdKqi8 MQuHNbK6847uUnjqLjJrscbrgG0Pth9I2ueqccmMGcDyPLeJ3QO40OYNL/TN8RgB1w673d gwBwRLs3cZKdks0h6V0m63EwBHhwhSa+LK6nHPFgr9DjL2uTEiWiIN2/n8leZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752511634; a=rsa-sha256; cv=none; b=w8rZzoafFM0uDswVVwM2L0e6ARhRAZBUrRYJ/PT22skbE5VCmE0c5tYQNglNuItl6trvvm xhMI2JpOMxmdJxnvgXp6yf/i7Dxb/P0QKIml8/WSyhtyWQcuYdE9jey1/7Zwsh1xim5Lpj oyQwApWuxD74mEPnjXZ/Tfc76pjHkE//j5D2JOeEVIVv+zusNXj2RyY1Y13SEFFyJK05+S iy+GKVqRClnBXjf0eGS3OwN25XW2oFjmU0JTP3qBeUNkx8Aqo4KNyezVC7w7ssrP+1glA8 2oiU+BWGCsg+aO6K7jPAPfI8mo5Yg8ejUJaBZlHfCa6cJngs6JteSs6GEDEe6Q== 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 4bgpBp4Kjpz122L; Mon, 14 Jul 2025 16:47:14 +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 56EGlEtV065142; Mon, 14 Jul 2025 16:47:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EGlEMB065138; Mon, 14 Jul 2025 16:47:14 GMT (envelope-from git) Date: Mon, 14 Jul 2025 16:47:14 GMT Message-Id: <202507141647.56EGlEMB065138@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: e912101db10b - stable/14 - contrib/mandoc: add -isoC-2024 and -svid1 to mdoc(7) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e912101db10b45e8f440da44ae06e0f0383d24ad Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=e912101db10b45e8f440da44ae06e0f0383d24ad commit e912101db10b45e8f440da44ae06e0f0383d24ad Author: Robert Clausecker AuthorDate: 2024-10-25 15:05:20 +0000 Commit: Alexander Ziaee CommitDate: 2025-07-14 16:44:44 +0000 contrib/mandoc: add -isoC-2024 and -svid1 to mdoc(7) C23 (ISO/IEC 9899:2024) is not out yet, but will be shortly. SVID1 is needed for the history section of memccpy(3). Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47284 (cherry picked from commit 7ed159c6cc00adf6f75f9a43024f23509f5b8e5e) --- contrib/mandoc/st.c | 2 ++ lib/libc/string/memccpy.3 | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/mandoc/st.c b/contrib/mandoc/st.c index 266df0081a95..cb6bf3303126 100644 --- a/contrib/mandoc/st.c +++ b/contrib/mandoc/st.c @@ -56,6 +56,7 @@ LINE("-isoC-tcor1", "ISO/IEC 9899/TCOR1:1994 (\\(lqISO\\~C90, Technical Corrigen LINE("-isoC-tcor2", "ISO/IEC 9899/TCOR2:1995 (\\(lqISO\\~C90, Technical Corrigendum 2\\(rq)") LINE("-isoC-99", "ISO/IEC 9899:1999 (\\(lqISO\\~C99\\(rq)") LINE("-isoC-2011", "ISO/IEC 9899:2011 (\\(lqISO\\~C11\\(rq)") +LINE("-isoC-2024", "ISO/IEC 9899:2024 (\\(lqISO\\~C23\\(rq)") LINE("-iso9945-1-90", "ISO/IEC 9945-1:1990 (\\(lqPOSIX.1\\(rq)") LINE("-iso9945-1-96", "ISO/IEC 9945-1:1996 (\\(lqPOSIX.1\\(rq)") LINE("-iso9945-2-93", "ISO/IEC 9945-2:1993 (\\(lqPOSIX.2\\(rq)") @@ -79,6 +80,7 @@ LINE("-susv1", "Version\\~1 of the Single UNIX Specification (\\(lqSUSv1\\(rq)" LINE("-susv2", "Version\\~2 of the Single UNIX Specification (\\(lqSUSv2\\(rq)") LINE("-susv3", "Version\\~3 of the Single UNIX Specification (\\(lqSUSv3\\(rq)") LINE("-susv4", "Version\\~4 of the Single UNIX Specification (\\(lqSUSv4\\(rq)") +LINE("-svid1", "System\\~V Interface Definition, First Edition (\\(lqSVID1\\(rq)") LINE("-svid4", "System\\~V Interface Definition, Fourth Edition (\\(lqSVID4\\(rq)") return NULL; diff --git a/lib/libc/string/memccpy.3 b/lib/libc/string/memccpy.3 index fe543d9172d3..54498610fde7 100644 --- a/lib/libc/string/memccpy.3 +++ b/lib/libc/string/memccpy.3 @@ -82,16 +82,14 @@ The function conforms to .St -p1003.1-2004 and -.\" St -isoC-2024 . -ISO/IEC 9899:2024 (\(lqISO\~C23\(rq). +.St -isoC-2024 . .Sh HISTORY The .Fn memccpy function first appeared in .Bx 4.4 and was first specified in the -.\" St -svid1 . -System\~V Interface Definition, First Edition (\(lqSVID1\(rq). +.St -svid1 . The .Ft restrict keyword was added to the prototype in From nobody Mon Jul 14 16:47:15 2025 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 4bgpBr38LLz61xMj; Mon, 14 Jul 2025 16:47: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgpBq5pztz481D; Mon, 14 Jul 2025 16:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752511635; 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=tuSrBbkfpgp3mJx50NXTs7JCgzhI2I3vNCGrSJ0OXt8=; b=g0fngHRZ1vo+NGMrctq3k72+GieARkoZRrrFdfC3qZDCMHsZTWGGrepId44Tr8oWPN3fcz z/Hu2fZ/9hWs6IwGB1JZC15Fe5U+SafWCVo+r4W9e5Mb3cj41msksMKvEnotgUfrEcXLe8 62qA5RIHol52ZgL+DoQj5BGUJFYJBZBBGqyLF3ixX5HxGfgIP4tyQgHdfDXoDA+CvSe0Qb /W6iuhdR8Lcbb0UvYzn7QzYXaGHLLTNWYPYA02Mm1zetnWi58mGCh6aUEd3t4KmhdyFE2p xcixXi242RNs0ZJMba+BFz9vX/FjqEJxQ9TBNVi2OkcbRu/5hKdP7VcgqPPSfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752511635; 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=tuSrBbkfpgp3mJx50NXTs7JCgzhI2I3vNCGrSJ0OXt8=; b=LXAh/YBDkhrRCM5ArxHj5qAZYpm7LpdlYk7C5bJKZwmuDObNHfcTdJTGVjX/2dJoqj1vwA 09fo4uB4laI+fvmqtwTQwDEjc6tsQcWfhC4Qn7yJMvyCO4dyFCec1SsdwabrNBEBsiJUHB 2AwGTUG6NdzUE0YazFaV1TxFP3ZcxN4Z7aSG4dYSAHWwnJ54sDkSPlQzzqlEKrKZEsYYmS YSJLomuBfLswomoOo66Yt12AA7tIAaUIu5aGaRk1IlPK5Frh6i2uWQDaCA9CaJWLpxEPOm 67XNozNWL0fawH0SuVdMTamv49kCWvHHWW8II3i2H0/zx9s/eOPItqMdBUEd9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752511635; a=rsa-sha256; cv=none; b=QLSTODX4TR/tKFif6kq0aptc/i5gUAeucLP+Yq1HK4yjKo1RWz29Ev60ncR0uvKGRn99L4 /+9meAMP0dGqrIbEIC0TPuOokTUSystTjfZYPw9P4DQdw2RSs8xMhrh4Dmb/DliI2V2AdL nGYgXkAzFBeHGtaLblBK3Ug7ndx3L83JokS000fHYSMFPyCCiUfO7OM6mTt6lDBeHyL6Og wOO7L8FVbswUk0EMvCdMXvkzIV5sDZiVf3B3PGplnAtGuPEkJBU04RCBgKvy4cpswi3nk8 10sjdck/9xjBSIujJH3FH8Oaidl31XtugUwCzXTs6Tv4d1DtCKACyqRJG0357g== 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 4bgpBq4zrLz12R5; Mon, 14 Jul 2025 16:47:15 +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 56EGlF5u065175; Mon, 14 Jul 2025 16:47:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EGlFke065172; Mon, 14 Jul 2025 16:47:15 GMT (envelope-from git) Date: Mon, 14 Jul 2025 16:47:15 GMT Message-Id: <202507141647.56EGlFke065172@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: dd276946d561 - stable/14 - Merge mandoc snapshot 2024-09-22 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dd276946d56197947c47fa7a37255859aea6e942 Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=dd276946d56197947c47fa7a37255859aea6e942 commit dd276946d56197947c47fa7a37255859aea6e942 Author: Brooks Davis AuthorDate: 2024-12-06 20:47:31 +0000 Commit: Alexander Ziaee CommitDate: 2025-07-14 16:44:44 +0000 Merge mandoc snapshot 2024-09-22 (cherry picked from commit c1c95add8c80843ba15d784f95c361d795b1f593) --- contrib/mandoc/LICENSE | 5 +- contrib/mandoc/Makefile | 13 +- contrib/mandoc/Makefile.depend | 89 ++-- contrib/mandoc/NEWS | 4 +- contrib/mandoc/TODO | 105 +++- contrib/mandoc/catman.c | 4 +- contrib/mandoc/cgi.c | 121 +++-- contrib/mandoc/chars.c | 5 +- contrib/mandoc/compat_strsep.c | 4 +- contrib/mandoc/configure | 13 +- contrib/mandoc/configure.local.example | 14 +- contrib/mandoc/dba_read.c | 4 +- contrib/mandoc/demandoc.1 | 5 +- contrib/mandoc/demandoc.c | 13 +- contrib/mandoc/eqn.c | 28 +- contrib/mandoc/eqn_parse.h | 6 +- contrib/mandoc/html.c | 17 +- contrib/mandoc/html.h | 6 +- contrib/mandoc/main.c | 43 +- contrib/mandoc/makewhatis.8 | 8 +- contrib/mandoc/man.1 | 8 +- contrib/mandoc/man.7 | 34 +- contrib/mandoc/man.c | 43 +- contrib/mandoc/man.cgi.8 | 14 +- contrib/mandoc/man_html.c | 112 +++-- contrib/mandoc/man_macro.c | 24 +- contrib/mandoc/man_term.c | 108 +++-- contrib/mandoc/man_validate.c | 68 +-- contrib/mandoc/mandoc.1 | 206 +++++--- contrib/mandoc/mandoc.c | 394 +-------------- contrib/mandoc/mandoc.css | 51 +- contrib/mandoc/mandoc.h | 32 +- contrib/mandoc/mandoc_aux.c | 5 +- contrib/mandoc/mandoc_aux.h | 8 +- contrib/mandoc/mandoc_char.7 | 21 +- contrib/mandoc/mandoc_dbg.c | 343 +++++++++++++ contrib/mandoc/mandoc_dbg.h | 55 +++ contrib/mandoc/mandoc_dbg_init.3 | 280 +++++++++++ contrib/mandoc/mandoc_escape.3 | 172 ++++--- contrib/mandoc/mandoc_headers.3 | 37 +- contrib/mandoc/mandoc_html.3 | 8 +- contrib/mandoc/mandoc_msg.c | 13 +- contrib/mandoc/mandocd.8 | 8 +- contrib/mandoc/mandocd.c | 15 +- contrib/mandoc/mandocdb.c | 75 ++- contrib/mandoc/manpath.c | 87 ++-- contrib/mandoc/mansearch.c | 6 +- contrib/mandoc/mdoc.7 | 75 +-- contrib/mandoc/mdoc_html.c | 81 ++-- contrib/mandoc/mdoc_macro.c | 12 +- contrib/mandoc/mdoc_man.c | 4 +- contrib/mandoc/mdoc_markdown.c | 6 +- contrib/mandoc/mdoc_state.c | 53 +- contrib/mandoc/mdoc_term.c | 29 +- contrib/mandoc/mdoc_validate.c | 16 +- contrib/mandoc/out.c | 39 +- contrib/mandoc/out.h | 7 +- contrib/mandoc/read.c | 9 +- contrib/mandoc/roff.7 | 43 +- contrib/mandoc/roff.c | 858 +++++++++++++++++---------------- contrib/mandoc/roff.h | 27 +- contrib/mandoc/roff_escape.c | 546 +++++++++++++++++++++ contrib/mandoc/roff_int.h | 5 +- contrib/mandoc/roff_term.c | 4 +- contrib/mandoc/st.c | 5 +- contrib/mandoc/tag.c | 74 ++- contrib/mandoc/tbl.7 | 12 +- contrib/mandoc/tbl_html.c | 15 +- contrib/mandoc/tbl_term.c | 23 +- contrib/mandoc/term.c | 137 ++++-- contrib/mandoc/term.h | 7 +- contrib/mandoc/term_ascii.c | 9 +- contrib/mandoc/term_tab.c | 24 +- contrib/mandoc/tree.c | 14 +- usr.bin/mandoc/Makefile | 2 + 75 files changed, 3215 insertions(+), 1655 deletions(-) diff --git a/contrib/mandoc/LICENSE b/contrib/mandoc/LICENSE index 0a0fc1acd2ac..8b464f4e6aec 100644 --- a/contrib/mandoc/LICENSE +++ b/contrib/mandoc/LICENSE @@ -1,11 +1,11 @@ -$Id: LICENSE,v 1.22 2021/09/19 11:02:09 schwarze Exp $ +$Id: LICENSE,v 1.23 2022/06/25 12:44:25 schwarze Exp $ With the exceptions noted below, all non-trivial files contained in the mandoc toolkit are protected by the Copyright of the following developers: +Copyright (c) 2010-2022 Ingo Schwarze Copyright (c) 2008-2012, 2014 Kristaps Dzonsons -Copyright (c) 2010-2021 Ingo Schwarze Copyright (c) 1999, 2004, 2017 Marc Espie Copyright (c) 2009, 2010, 2011, 2012 Joerg Sonnenberger Copyright (c) 2013 Franco Fichtner @@ -13,6 +13,7 @@ Copyright (c) 2014 Baptiste Daroussin Copyright (c) 2016 Ed Maste Copyright (c) 2017 Michael Stapelberg Copyright (c) 2017 Anthony Bentley +Copyright (c) 2022 Anna Vyalkova Copyright (c) 1998, 2004, 2010, 2015 Todd C. Miller Copyright (c) 2008, 2017 Otto Moerbeek Copyright (c) 2004 Ted Unangst diff --git a/contrib/mandoc/Makefile b/contrib/mandoc/Makefile index 48c4741812b6..cd3f16652069 100644 --- a/contrib/mandoc/Makefile +++ b/contrib/mandoc/Makefile @@ -1,6 +1,6 @@ -# $Id: Makefile,v 1.540 2021/09/21 11:04:40 schwarze Exp $ +# $Id: Makefile,v 1.543 2023/10/19 11:45:42 schwarze Exp $ # -# Copyright (c) 2011, 2013-2021 Ingo Schwarze +# Copyright (c) 2011, 2013-2022 Ingo Schwarze # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons # # Permission to use, copy, modify, and distribute this software for any @@ -100,6 +100,7 @@ SRCS = arch.c \ man_validate.c \ mandoc.c \ mandoc_aux.c \ + mandoc_dbg.c \ mandoc_msg.c \ mandoc_ohash.c \ mandoc_xr.c \ @@ -121,6 +122,7 @@ SRCS = arch.c \ preconv.c \ read.c \ roff.c \ + roff_escape.c \ roff_html.c \ roff_term.c \ roff_validate.c \ @@ -186,6 +188,8 @@ DISTFILES = INSTALL \ mandoc.h \ mandoc_aux.h \ mandoc_char.7 \ + mandoc_dbg.h \ + mandoc_dbg_init.3 \ mandoc_escape.3 \ mandoc_headers.3 \ mandoc_html.3 \ @@ -232,6 +236,7 @@ LIBMDOC_OBJS = att.o \ LIBROFF_OBJS = eqn.o \ roff.o \ + roff_escape.o \ roff_validate.o \ tbl.o \ tbl_data.o \ @@ -241,6 +246,7 @@ LIBROFF_OBJS = eqn.o \ LIBMANDOC_OBJS = $(LIBMAN_OBJS) \ $(LIBMDOC_OBJS) \ $(LIBROFF_OBJS) \ + $(DEBUG_OBJS) \ arch.o \ chars.o \ mandoc.o \ @@ -333,6 +339,7 @@ WWW_MANS = apropos.1.html \ soelim.1.html \ man.cgi.3.html \ mandoc.3.html \ + mandoc_dbg_init.3.html \ mandoc_escape.3.html \ mandoc_headers.3.html \ mandoc_html.3.html \ @@ -409,6 +416,7 @@ base-install: mandoc demandoc soelim mkdir -p $(DESTDIR)$(MANDIR)/man5 mkdir -p $(DESTDIR)$(MANDIR)/man7 mkdir -p $(DESTDIR)$(MANDIR)/man8 + mkdir -p $(DESTDIR)$(MISCDIR) $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR) $(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM) cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_MAN) @@ -431,6 +439,7 @@ base-install: mandoc demandoc soelim $(INSTALL_MAN) mandoc_char.7 $(DESTDIR)$(MANDIR)/man7 $(INSTALL_MAN) makewhatis.8 \ $(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8 + $(INSTALL_DATA) mandoc.css $(DESTDIR)$(MISCDIR) lib-install: libmandoc.a mkdir -p $(DESTDIR)$(LIBDIR) diff --git a/contrib/mandoc/Makefile.depend b/contrib/mandoc/Makefile.depend index d5f6556c3e7e..5179e95d4715 100644 --- a/contrib/mandoc/Makefile.depend +++ b/contrib/mandoc/Makefile.depend @@ -1,8 +1,8 @@ arch.o: arch.c config.h roff.h att.o: att.c config.h roff.h libmdoc.h catman.o: catman.c config.h compat_fts.h -cgi.o: cgi.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h main.h manconf.h mansearch.h cgi.h -chars.o: chars.c config.h mandoc.h mandoc_aux.h mandoc_ohash.h compat_ohash.h libmandoc.h +cgi.o: cgi.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h main.h manconf.h mansearch.h cgi.h +chars.o: chars.c config.h mandoc.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h libmandoc.h compat_err.o: compat_err.c config.h compat_fts.o: compat_fts.c config.h compat_fts.h compat_getline.o: compat_getline.c config.h @@ -22,62 +22,63 @@ compat_strndup.o: compat_strndup.c config.h compat_strsep.o: compat_strsep.c config.h compat_strtonum.o: compat_strtonum.c config.h compat_vasprintf.o: compat_vasprintf.c config.h -dba.o: dba.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mansearch.h dba_write.h dba_array.h dba.h -dba_array.o: dba_array.c config.h mandoc_aux.h dba_write.h dba_array.h -dba_read.o: dba_read.c config.h mandoc_aux.h mansearch.h dba_array.h dba.h dbm.h +dba.o: dba.c config.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h mansearch.h dba_write.h dba_array.h dba.h +dba_array.o: dba_array.c config.h mandoc_aux.h mandoc_dbg.h dba_write.h dba_array.h +dba_read.o: dba_read.c config.h mandoc_aux.h mandoc_dbg.h mansearch.h dba_array.h dba.h dbm.h dba_write.o: dba_write.c config.h dba_write.h dbm.o: dbm.c config.h mansearch.h dbm_map.h dbm.h dbm_map.o: dbm_map.c config.h mansearch.h dbm_map.h dbm.h -demandoc.o: demandoc.c config.h mandoc.h roff.h man.h mdoc.h mandoc_parse.h -eqn.o: eqn.c config.h mandoc_aux.h mandoc.h roff.h eqn.h libmandoc.h eqn_parse.h +demandoc.o: demandoc.c config.h mandoc.h mandoc_dbg.h roff.h man.h mdoc.h mandoc_parse.h +eqn.o: eqn.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h eqn.h libmandoc.h eqn_parse.h eqn_html.o: eqn_html.c config.h mandoc.h roff.h eqn.h out.h html.h eqn_term.o: eqn_term.c config.h eqn.h out.h term.h -html.o: html.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h out.h html.h manconf.h main.h +html.o: html.c config.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h out.h html.h manconf.h main.h lib.o: lib.c config.h roff.h libmdoc.h lib.in -main.o: main.c config.h mandoc_aux.h mandoc.h mandoc_xr.h roff.h mdoc.h man.h mandoc_parse.h tag.h term_tag.h main.h manconf.h mansearch.h -man.o: man.c config.h mandoc_aux.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h -man_html.o: man_html.c config.h mandoc_aux.h mandoc.h roff.h man.h out.h html.h main.h -man_macro.o: man_macro.c config.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h -man_term.o: man_term.c config.h mandoc_aux.h mandoc.h roff.h man.h out.h term.h term_tag.h main.h -man_validate.o: man_validate.c config.h mandoc_aux.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h tag.h -mandoc.o: mandoc.c config.h mandoc_aux.h mandoc.h roff.h libmandoc.h roff_int.h -mandoc_aux.o: mandoc_aux.c config.h mandoc.h mandoc_aux.h +main.o: main.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h mandoc_xr.h roff.h mdoc.h man.h mandoc_parse.h tag.h term_tag.h main.h manconf.h mansearch.h +man.o: man.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h +man_html.o: man_html.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h man.h out.h html.h main.h +man_macro.o: man_macro.c config.h mandoc_dbg.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h +man_term.o: man_term.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h man.h out.h term.h term_tag.h main.h +man_validate.o: man_validate.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h tag.h +mandoc.o: mandoc.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h libmandoc.h roff_int.h +mandoc_aux.o: mandoc_aux.c config.h mandoc.h mandoc_aux.h mandoc_dbg.h +mandoc_dbg.o: mandoc_dbg.c config.h compat_ohash.h mandoc_aux.h mandoc_dbg.h mandoc.h mandoc_msg.o: mandoc_msg.c config.h mandoc.h -mandoc_ohash.o: mandoc_ohash.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h -mandoc_xr.o: mandoc_xr.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc_xr.h -mandocd.o: mandocd.c config.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h main.h manconf.h -mandocdb.o: mandocdb.c config.h compat_fts.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h manconf.h mansearch.h dba_array.h dba.h -manpath.o: manpath.c config.h mandoc_aux.h mandoc.h manconf.h -mansearch.o: mansearch.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h manconf.h mansearch.h dbm.h -mdoc.o: mdoc.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h -mdoc_argv.o: mdoc_argv.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h -mdoc_html.o: mdoc_html.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h out.h html.h main.h -mdoc_macro.o: mdoc_macro.c config.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h -mdoc_man.o: mdoc_man.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h out.h main.h -mdoc_markdown.o: mdoc_markdown.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h main.h -mdoc_state.o: mdoc_state.c config.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h -mdoc_term.o: mdoc_term.c config.h mandoc_aux.h roff.h mdoc.h out.h term.h term_tag.h main.h -mdoc_validate.o: mdoc_validate.c config.h mandoc_aux.h mandoc.h mandoc_xr.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h tag.h +mandoc_ohash.o: mandoc_ohash.c config.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h +mandoc_xr.o: mandoc_xr.c config.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h mandoc_xr.h +mandocd.o: mandocd.c config.h mandoc.h mandoc_dbg.h roff.h mdoc.h man.h mandoc_parse.h main.h manconf.h +mandocdb.o: mandocdb.c config.h compat_fts.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h manconf.h mansearch.h dba_array.h dba.h +manpath.o: manpath.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h manconf.h +mansearch.o: mansearch.c config.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h manconf.h mansearch.h dbm.h +mdoc.o: mdoc.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h +mdoc_argv.o: mdoc_argv.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h +mdoc_html.o: mdoc_html.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h mdoc.h out.h html.h main.h +mdoc_macro.o: mdoc_macro.c config.h mandoc_dbg.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h +mdoc_man.o: mdoc_man.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h mdoc.h man.h out.h main.h +mdoc_markdown.o: mdoc_markdown.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h mdoc.h main.h +mdoc_state.o: mdoc_state.c config.h mandoc_dbg.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h +mdoc_term.o: mdoc_term.c config.h mandoc_aux.h mandoc_dbg.h roff.h mdoc.h out.h term.h term_tag.h main.h +mdoc_validate.o: mdoc_validate.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h mandoc_xr.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h tag.h msec.o: msec.c config.h mandoc.h libmandoc.h msec.in -out.o: out.c config.h mandoc_aux.h mandoc.h tbl.h out.h +out.o: out.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h tbl.h out.h preconv.o: preconv.c config.h mandoc.h roff.h mandoc_parse.h libmandoc.h -read.o: read.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h libmandoc.h roff_int.h tag.h -roff.o: roff.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h mandoc_parse.h libmandoc.h roff_int.h tbl_parse.h eqn_parse.h predefs.in +read.o: read.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h libmandoc.h roff_int.h tag.h +roff.o: roff.c config.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h mandoc_parse.h libmandoc.h roff_int.h tbl_parse.h eqn_parse.h predefs.in roff_html.o: roff_html.c config.h mandoc.h roff.h out.h html.h roff_term.o: roff_term.c config.h mandoc.h roff.h out.h term.h roff_validate.o: roff_validate.c config.h mandoc.h roff.h libmandoc.h roff_int.h soelim.o: soelim.c config.h compat_stringlist.h st.o: st.c config.h mandoc.h roff.h libmdoc.h -tag.o: tag.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h roff.h mdoc.h roff_int.h tag.h -tbl.o: tbl.c config.h mandoc_aux.h mandoc.h tbl.h libmandoc.h tbl_parse.h tbl_int.h -tbl_data.o: tbl_data.c config.h mandoc_aux.h mandoc.h tbl.h libmandoc.h tbl_int.h -tbl_html.o: tbl_html.c config.h mandoc.h roff.h tbl.h out.h html.h -tbl_layout.o: tbl_layout.c config.h mandoc_aux.h mandoc.h tbl.h libmandoc.h tbl_int.h +tag.o: tag.c config.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h roff.h mdoc.h roff_int.h tag.h +tbl.o: tbl.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h tbl.h libmandoc.h tbl_parse.h tbl_int.h +tbl_data.o: tbl_data.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h tbl.h libmandoc.h tbl_int.h +tbl_html.o: tbl_html.c config.h mandoc_dbg.h mandoc.h roff.h tbl.h out.h html.h +tbl_layout.o: tbl_layout.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h tbl.h libmandoc.h tbl_int.h tbl_opts.o: tbl_opts.c config.h mandoc.h tbl.h libmandoc.h tbl_int.h -tbl_term.o: tbl_term.c config.h mandoc.h tbl.h out.h term.h -term.o: term.c config.h mandoc.h mandoc_aux.h out.h term.h main.h -term_ascii.o: term_ascii.c config.h mandoc.h mandoc_aux.h out.h term.h manconf.h main.h -term_ps.o: term_ps.c config.h mandoc_aux.h out.h term.h manconf.h main.h -term_tab.o: term_tab.c config.h mandoc_aux.h out.h term.h +tbl_term.o: tbl_term.c config.h mandoc_dbg.h mandoc.h tbl.h out.h term.h +term.o: term.c config.h mandoc.h mandoc_aux.h mandoc_dbg.h out.h term.h main.h +term_ascii.o: term_ascii.c config.h mandoc.h mandoc_aux.h mandoc_dbg.h out.h term.h manconf.h main.h +term_ps.o: term_ps.c config.h mandoc_aux.h mandoc_dbg.h out.h term.h manconf.h main.h +term_tab.o: term_tab.c config.h mandoc_aux.h mandoc_dbg.h out.h term.h term_tag.o: term_tag.c config.h mandoc.h roff.h roff_int.h tag.h term_tag.h tree.o: tree.c config.h mandoc.h roff.h mdoc.h man.h tbl.h eqn.h main.h diff --git a/contrib/mandoc/NEWS b/contrib/mandoc/NEWS index 634ffaf6ccfa..fdec026e9fec 100644 --- a/contrib/mandoc/NEWS +++ b/contrib/mandoc/NEWS @@ -1,4 +1,4 @@ -$Id: NEWS,v 1.40 2021/09/23 18:03:00 schwarze Exp $ +$Id: NEWS,v 1.41 2021/09/25 15:42:08 schwarze Exp $ This file lists the most important changes in the mandoc.bsd.lv distribution. @@ -195,7 +195,7 @@ Changes in version 1.14.6, released on September 23, 2021 for an additional regression test * Michal Nowak for reporting several code style issues * TJ Townsend (OpenBSD) for help with CSS - * Sevan Janiyan (NetBSD) and Robert Mustacchi (Illumos) + * Sevan Janiyan (Viewpoint Linux) and Robert Mustacchi (Illumos) for extensive release testing * Job Snijders, Kinichiro INOGUCHI, and Martijn van Duren (OpenBSD) for checking patches diff --git a/contrib/mandoc/TODO b/contrib/mandoc/TODO index 4135a3eca6c8..58d0d6937746 100644 --- a/contrib/mandoc/TODO +++ b/contrib/mandoc/TODO @@ -1,6 +1,6 @@ ************************************************************************ * Official mandoc TODO. -* $Id: TODO,v 1.319 2021/09/21 17:58:13 schwarze Exp $ +* $Id: TODO,v 1.335 2024/09/21 12:08:54 schwarze Exp $ ************************************************************************ Many issues are annotated for difficulty as follows: @@ -68,6 +68,14 @@ are mere guesses, and some may be wrong. but watch out for regressions in the high-level parsers maybe it should not even remove comments? - consider T{\" +- In the body of conditional requests, escape sequence expansion + must not be performed if the condition is false. This implies + the first part of a request line must be expanded before + request parsing (like it is now), but expansion in the second + part must be delayed. + to Nab 8 Aug 2023 20:05:32 +0200 Subject: if/ie d condition always true + loc ** exist *** algo *** size ** imp * + ************************************************************************ * missing features @@ -149,6 +157,11 @@ are mere guesses, and some may be wrong. --- missing mdoc features ---------------------------------------------- +- support mixed case for section names + also, first section is not "NAME" should not appear more than once per page + Alejandro Colomar 28 Apr 2023 16:57:49 +0200 + loc * exist * algo * size * imp *** + - .Sh and .Ss should be parsed and partially callable, see groff_mdoc(7) reed at reedmedia dot net Sat, 21 Dec 2019 17:13:07 -0600 loc ** exist ** algo ** size ** imp * @@ -292,7 +305,11 @@ are mere guesses, and some may be wrong. --- missing misc features ---------------------------------------------- -- conisder whether man(1) fallback code in main.c/fs_*() can find files +- use the default volume headers for sections with suffixes + certainly affects man(7); possibly mdoc(7)?; and also groff(1) + Alejandro Colomar 21 Aug 2022 + +- consider whether man(1) fallback code in main.c/fs_*() can find files like man3c/fopen.3c (illumos, Solaris) and man3p/fopen.3p (POSIX) discussed with Robert Mustacchi 21 Sep 2021 10:39:40 -0700 loc * exist * algo ** size * imp ** @@ -302,6 +319,11 @@ are mere guesses, and some may be wrong. mail to sternenseemann 19 Aug 2021 19:11:50 +0200 loc * exist ** algo ** size * imp ** +- handle Unicode letters in tags in both HTML and terminal output + thread "section headers with diacritics" starting with + Mario Blaettermann 24 Mar 2022 18:13:23 +0100 + loc ** exist * algo * size * imp ** + - -T man does not handle eqn(7) and tbl(7) Stephen Gregoratto 16 Feb 2020 01:28:07 +1100 also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901636 @@ -325,6 +347,10 @@ are mere guesses, and some may be wrong. (3) undefined, just output the character -> perhaps WARNING loc *** exist ** algo ** size ** imp *** (parser reorg helps) +- man.conf(5) alias aliasname dirname or just -Mb -Mx -Mp + mail to jmc@ Mar 23, 2015 03:53:14PM +0100 + loc * exist * algo * size * imp ** + - kettenis wants base roff, ms, and me Fri, 1 Jan 2010 22:13:15 +0100 (CET) loc ** exist ** algo ** size *** imp * @@ -443,6 +469,10 @@ are mere guesses, and some may be wrong. reminded by jmc@ Thu, 23 Sep 2010 18:13:39 +0059 loc * exist ** algo *** size * imp *** +- the man(7) single-font macros (e.g. .B) use .itc, + so ".B foo\c" followed by "bar" prints "bar" in bold + gbranden@ Sun, 5 Jun 2022 18:08:46 -0500 + - a line starting with "\fB something" counts as starting with whitespace and triggers a line break; found in audio/normalize-mp3(1) This will become easier once escape sequences are represented @@ -468,20 +498,46 @@ are mere guesses, and some may be wrong. --- HTML issues -------------------------------------------------------- -- make the HTML scaffolding customozable with -O skip=... +- support the idiom .TP .IP .TP for multi-paragraph list item bodies + to: Alejandro Colomar Thu, 19 Oct 2023 16:45:21 +0200 + loc ** exist ** algo ** size ** imp ** + +- .Nm without an argument and .Bx cause premature + Nab Sun, 5 Jun 2022 18:30:09 +0200 + +- .Aq Mt could set and reset "white-space: nowrap"; + Check whether other enclosure macros could profit from similar handling, + or whether that is covered by Unicode line-breaking classes WJ, ZW, GL, ZWJ. + John Gardner 25 Mar 2022 04:44:27 +1100 + +- make the HTML scaffolding customizable with -O skip=... mail to Oliver Corff 3 Jun 2021 17:28:02 +0200 more feedback from Oliver 3 Jun 2021 18:27:56 +0200 more feedback from Oliver 3 Jun 2021 23:37:18 +0200 + would also be useful for + https://github.com/gbdev/rgbds-www/blob/master/ + maintainer/support/man_postproc.awk - .Bd -unfilled should not use monospaced font anton@ 4 Mar 2021 08:19:35 +0100 loc ** exist * algo * size * imp ** -- HTML formatting of .nf should avoid
+- HTML formatting of .nf should avoid
, + even when input lines start with whitespace, and not close and re-open 
 on .P
   my mail to ports@ 27 Jun 2021 16:09:20 +0200
+  reported again by Mohamed Akram 25 Jun 2022 16:28:18 +0000
   loc **  exist **  algo *  size *  imp **
 
+- tbl(7) HTML output does not implement column width specifications
+  reported by Ted Bullock 11 Jan 2022 16:00:44 -0700
+  loc *  exist *  algo ?  size ?  imp *
+
+- link from flags in the SYNOPSIS to their descriptions
+  https://github.com/gbdev/rgbds-www/blob/master/
+  maintainer/support/man_postproc.awk
+  loc *  exist *  algo **  size *  imp *
+
 - get rid of the last handful of style= attributes such that
   Content-Security-Policy: can be enabled without unsafe-inline
   suggested by bentley@  Nov 10, 2019 at 06:02:49AM -0700
@@ -504,19 +560,18 @@ are mere guesses, and some may be wrong.
   does this affect other characters, other source macros...?
   Jackson Pauls  29 Aug 2017 16:56:27 +0100
 
-- The tables used to render the three-part page headers actually force
-  the width of the  to the max-width given for .
-  Not yet sure how to fix that...
-  Observed by an Anonymous Coward on undeadly.org:
-  http://undeadly.org/cgi?action=article&sid=20140925064244&pid=1
-  loc *  exist *  algo **  size *  imp ***
-
 - generate  tags in HTML
   idea from florian@  Tue, 7 Apr 2015 00:26:28 +0000
   may be possible to implement with .Lk img://something.png alt_text
 
 - check https://github.com/trentm/mdocml
 
+--- CSS issues ---------------------------------------------------------
+
+- use flexbox for .Bl-tag instead of the fragile float/clear mechanism
+  John Gardner 25 Mar 2022 04:44:27 +1100
+
+
 ************************************************************************
 * formatting issues: gratuitous differences
 ************************************************************************
@@ -527,7 +582,17 @@ are mere guesses, and some may be wrong.
   Steffen Nurpmeso  Sat, 08 Nov 2014 13:34:59 +0100
   loc *  exist **  algo **  size *  imp **
 
-- In .Bl -enum -width 0n, groff continues one the same line after
+- Multiple issues with .In below SYNOPSIS; groff behaviour is:
+  text line + .In -> no line break before #include
+  called .In -> no line break before angle bracket
+  .In + .In -> second one gets #include, too
+  two arguments -> line break before second
+  child macro -> line break before child
+  .In + text line -> line break before the text line
+  Evan Silberman  Fri, 20 Sep 2024 16:48:19 -0700
+  loc **  exist **  algo *  size *  imp *
+
+- In .Bl -enum -width 0n, groff continues on the same line after
   the number, mandoc breaks the line.
   mail to kristaps@  Mon, 20 Jul 2009 02:21:39 +0200
   loc *  exist **  algo **  size *  imp **
@@ -562,6 +627,10 @@ are mere guesses, and some may be wrong.
   reported again by Nicolas Joly Thu, 1 Mar 2012 13:41:26 +0100 via wiz@ 5 Mar
   reported again by Franco Fichtner Fri, 27 Sep 2013 21:02:28 +0200
   reported again by Bruce Evans Fri, 17 Feb 2017 21:22:44 +0100 via bapt@
+  https://reviews.freebsd.org/D35245
+  even groff_mdoc(7) uses this: Nab Sun, 5 Jun 2022 22:16:37 +0200
+  When implementing this, try to avoid breaking existing manuals,
+  or at least fix them: Jan Stary Sun, 5 Jun 2022 22:48:05 +0200
   loc ***  exist ***  algo ***  size **  imp ***
   An easy partial fix has been implemented as skip_leading_dot_word().
 
@@ -574,6 +643,10 @@ are mere guesses, and some may be wrong.
   with .ps and .nf/.fi produce execessive blank lines, see libJudy
   and graphics/dcmtk.  The parser reorg may help with this.
 
+- The man(7) .UR macro produces UTF-8 angle brackets in -Tutf8 output mode
+  with groff, but ASCII <> with mandoc
+  Alejandro Colomar Mon, 7 Aug 2023 17:13:29 +0200 Subject: hostname
+
 - trailing whitespace must be ignored even when followed by a font escape,
   see for example
     makes
@@ -590,6 +663,14 @@ are mere guesses, and some may be wrong.
   To: deraadt@ 25 Oct 2020 23:37:01 +0100
   loc **  exist *  algo *  size **  imp ***
 
+- warn about \\ and \. in interpretation mode
+  gbranden@, groff issue #62776, 10 Nov 2023 01:57:32 -0500
+
+- warn about output lines exceeding 80 characters
+  Alejandro Colomar Aug 22, 2022
+  not trivial because -T lint does not call any formatter
+  loc ***  exist *  algo **  size **  imp **
+
 - warn about duplicate .Sh/.Ss heads
   gre(4): Rename duplicate sections 20 Apr 2018 15:27:33 +0200
   loc *  exist *  algo *  size *  imp **
diff --git a/contrib/mandoc/catman.c b/contrib/mandoc/catman.c
index b1bab0f68c4b..e46613eb0e8c 100644
--- a/contrib/mandoc/catman.c
+++ b/contrib/mandoc/catman.c
@@ -1,4 +1,4 @@
-/*	$Id: catman.c,v 1.22 2020/06/14 23:40:31 schwarze Exp $ */
+/*	$Id: catman.c,v 1.23 2021/10/15 15:04:02 schwarze Exp $ */
 /*
  * Copyright (c) 2017 Michael Stapelberg 
  * Copyright (c) 2017 Ingo Schwarze 
@@ -62,7 +62,7 @@ run_mandocd(int sockfd, const char *outtype, const char* defos)
 	else
 		execlp("mandocd", "mandocd", "-T", outtype,
 		    "-I", defos, sockfdstr, (char *)NULL);
-	err(1, "exec");
+	err(1, "exec(mandocd)");
 }
 
 ssize_t
diff --git a/contrib/mandoc/cgi.c b/contrib/mandoc/cgi.c
index 91310ce404b4..57f3bb7a6e16 100644
--- a/contrib/mandoc/cgi.c
+++ b/contrib/mandoc/cgi.c
@@ -1,7 +1,8 @@
-/* $Id: cgi.c,v 1.175 2021/08/19 15:23:36 schwarze Exp $ */
+/* $Id: cgi.c,v 1.181 2023/04/28 19:11:03 schwarze Exp $ */
 /*
- * Copyright (c) 2014-2019, 2021 Ingo Schwarze 
+ * Copyright (c) 2014-2019, 2021, 2022 Ingo Schwarze 
  * Copyright (c) 2011, 2012 Kristaps Dzonsons 
+ * Copyright (c) 2022 Anna Vyalkova 
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -86,10 +87,10 @@ static	void		 pg_search(const struct req *);
 static	void		 pg_searchres(const struct req *,
 				struct manpage *, size_t);
 static	void		 pg_show(struct req *, const char *);
-static	void		 resp_begin_html(int, const char *, const char *);
+static	int		 resp_begin_html(int, const char *, const char *);
 static	void		 resp_begin_http(int, const char *);
 static	void		 resp_catman(const struct req *, const char *);
-static	void		 resp_copy(const char *);
+static	int		 resp_copy(const char *, const char *);
 static	void		 resp_end_html(void);
 static	void		 resp_format(const struct req *, const char *);
 static	void		 resp_searchform(const struct req *, enum focus);
@@ -352,22 +353,26 @@ resp_begin_http(int code, const char *msg)
 	fflush(stdout);
 }
 
-static void
-resp_copy(const char *filename)
+static int
+resp_copy(const char *element, const char *filename)
 {
 	char	 buf[4096];
 	ssize_t	 sz;
 	int	 fd;
 
-	if ((fd = open(filename, O_RDONLY)) != -1) {
-		fflush(stdout);
-		while ((sz = read(fd, buf, sizeof(buf))) > 0)
-			write(STDOUT_FILENO, buf, sz);
-		close(fd);
-	}
+	if ((fd = open(filename, O_RDONLY)) == -1)
+		return 0;
+
+	if (element != NULL)
+		printf("<%s>\n", element);
+	fflush(stdout);
+	while ((sz = read(fd, buf, sizeof(buf))) > 0)
+		write(STDOUT_FILENO, buf, sz);
+	close(fd);
+	return 1;
 }
 
-static void
+static int
 resp_begin_html(int code, const char *msg, const char *file)
 {
 	const char	*name, *sec, *cp;
@@ -413,14 +418,14 @@ resp_begin_html(int code, const char *msg, const char *file)
 	       "\n",
 	       CUSTOMIZE_TITLE);
 
-	resp_copy(MAN_DIR "/header.html");
+	return resp_copy("header", MAN_DIR "/header.html");
 }
 
 static void
 resp_end_html(void)
 {
-
-	resp_copy(MAN_DIR "/footer.html");
+	if (resp_copy("footer", MAN_DIR "/footer.html"))
+		puts("");
 
 	puts("\n"
 	     "");
@@ -431,7 +436,7 @@ resp_searchform(const struct req *req, enum focus focus)
 {
 	int		 i;
 
-	printf("
\n"
 	       "  
\n"
 	       "    Manual Page Search Parameters\n",
@@ -439,13 +444,14 @@ resp_searchform(const struct req *req, enum focus focus)
 
 	/* Write query input box. */
 
-	printf("    Search query:\n"
+	       "      q.query != NULL)
 		html_print(req->q.query);
-	printf( "\" size=\"40\"");
+	printf("\" size=\"40\"");
 	if (focus == FOCUS_QUERY)
 		printf(" autofocus");
-	puts(">");
+	puts(">\n    ");
 
 	/* Write submission buttons. */
 
@@ -457,7 +463,7 @@ resp_searchform(const struct req *req, enum focus focus)
 
 	/* Write section selector. */
 
-	puts("    ");
 	for (i = 0; i < sec_MAX; i++) {
 		printf("