From nobody Tue Jun 30 13:52:12 2026 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 4gqPhx5N6dz6kDbS for ; Tue, 30 Jun 2026 13:52:17 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gqPhx2w7Pz3Mg0 for ; Tue, 30 Jun 2026 13:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782827537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nzJ/AnUVV3qQ+yaPXJGCTeU7QKzPC8Ixxh8ZEmSZnys=; b=vgJ6kMDiaVER8yMkFv4L/3ysQpV7a2k1gkVznpy/jbmFV/8XnB8oJyb0q61aSa5cuuGdky rBSi5iLPmKkgPiimk6hvRdie82qxInXFjDT3VnVqgd8jmGx/feT5b2X9oWNhRKUbxNH/MR AsSFa00PmFIHrhP9KMIsWTWX1gaIr1dNrcIyhYaSkW8a/zkPdPgTaz82DAoOVX1xcju2LU EU3Q8Cul0Yyq+OynkCP2toi3EO/SnGgZc/oUCJo37wneJOFiQ9IDy2taBSJjoaIrfNp3P/ PlpRXmkFsRk15j3XHz+z1qQBA2iBy2/nwAacbulWIxVex5VC4KHHHAUsF5Kl5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782827537; a=rsa-sha256; cv=none; b=t8/cpx9CYBBBGrtwXXWWxS+NsNGI/l7hJlvaqHIzaSqaqVM9QMjRN+GoG1vR4HNYYaUl2e x8M4L/dEA8td4UpEq0X7eA952oaZVn1LoaVywK1QyI1HUQo7ln1Qcw8L4RuUJod/aCGmJB bFbAn7eMuZX1xbAIo6hmeD2JQglQm61jdO4vuRlT79xzsEr37cntKK70Pm3rsHN5lCGUJ/ ve1RNaLJEdEm6QXJre/zMg37pI0T1giwaUJx7IqsAu453DlS0UhQe6OuWOFK9YssHBPnDu unf9vCLdavhQIKchY6oE2o4AuEU/r9rVBCq4iLST5JclVcqP+J4HV8Enl2zDVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782827537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nzJ/AnUVV3qQ+yaPXJGCTeU7QKzPC8Ixxh8ZEmSZnys=; b=rbsc+I5W2xnU3tuEWmeKAdUQBQL3HDi3NNfKD3ELgybnLKSp28eRWMPCE3NMEH1DfdGf+R XOofH9Cn/Tzp+Nn7c8ecNtS4dsUZfcunuLswTLbgqQA8z8VdRHVqLtso0iI5TAEKQyEPqI l2HeI0HOoBoXWpShdZOVCycFPKlN4ji0ZBLq+bmfdZr9+c+LcRPDjkSK+jDHQhp2jwnpxB WU2eveZVk4ZgX2Kf9R8epTKU5hYctjjkuEsnFDRJ7FirWxmdBMAMWFRPXu4f9oudFJfDLt IJHQqc6sOJAAOB1/QF2ne4OcL8HlsVoAaQDaziqil+DZcKizz8NY5SQELh1/rg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqPhx1cBzzmH8 for ; Tue, 30 Jun 2026 13:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27f60 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 13:52:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Wolfram Schneider From: Alexander Ziaee Subject: git: 32cf24b725fd - main - ctfmerge.1: Import ENVIRONMENT from NetBSD 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 32cf24b725fdf899fb642c47004b69fcfae9b9db Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 13:52:12 +0000 Message-Id: <6a43ca0c.27f60.21fe6a65@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=32cf24b725fdf899fb642c47004b69fcfae9b9db commit 32cf24b725fdf899fb642c47004b69fcfae9b9db Author: Wolfram Schneider AuthorDate: 2026-06-30 13:20:41 +0000 Commit: Alexander Ziaee CommitDate: 2026-06-30 13:42:59 +0000 ctfmerge.1: Import ENVIRONMENT from NetBSD Import the ENVIRONMENT section from NetBSD, minus the variable that our ctfmerge does not have. Alphabetize them, polish grammar and alignment, and add the variables to the man database. While here, remove whitespace from the end of some lines to quiet linter. MFC after: 3 days PR: 291186 Co-authored-by: Alexander Ziaee Obtained from: NetBSD (christos , 8a0c0d8) Differential Revision: https://reviews.freebsd.org/D54054 --- cddl/usr.bin/ctfmerge/ctfmerge.1 | 74 ++++++++++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 26 deletions(-) diff --git a/cddl/usr.bin/ctfmerge/ctfmerge.1 b/cddl/usr.bin/ctfmerge/ctfmerge.1 index 2bc70db82dc9..1e371e62c9c5 100644 --- a/cddl/usr.bin/ctfmerge/ctfmerge.1 +++ b/cddl/usr.bin/ctfmerge/ctfmerge.1 @@ -1,32 +1,32 @@ .\" -.\" Copyright (c) 2010 The FreeBSD Foundation -.\" All rights reserved. -.\" +.\" Copyright (c) 2010 The FreeBSD Foundation +.\" All rights reserved. +.\" .\" This software was developed by Rui Paulo under sponsorship from the -.\" FreeBSD Foundation. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. +.\" FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. .\" -.Dd April 21, 2022 +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd June 30, 2026 .Dt CTFMERGE 1 .Os .Sh NAME @@ -104,6 +104,28 @@ Copy CTF data from into .Ar destfile . .El +.Sh ENVIRONMENT +The following environment variables are used by +.Nm : +.Bl -tag -width "CTFMERGE_TERMINATE_NO_UNLINK" +.It Ev CTFMERGE_DEBUG_LEVEL +Increase debugging verbosity +.Pq maximum 3 . +.It Ev CTFMERGE_INPUT_THROTTLE +Max queue size to queue +.Pq default 10 . +.It Ev CTFMERGE_PHASE1_BATCH_SIZE +Number of files in a slot that are needed before processing starts +.Pq default 8 . +.It Ev CTFMERGE_MAX_SLOTS +Number of round-robin slots in the input queue that is processed by +worker threads. +Each slot represents a file batch +.Pq default 5 . +.It Ev CTFMERGE_TERMINATE_NO_UNLINK +Do not remove temporary files on exit, +so that they can be examined for debugging. +.El .Sh EXIT STATUS .Ex -std .Sh SEE ALSO