From nobody Tue Apr 15 18:27:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZcXgg2yLHz5tbBY; Tue, 15 Apr 2025 18:27:11 +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 4ZcXgg2SCQz3wcn; Tue, 15 Apr 2025 18:27:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744741631; 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=hag0s75H7x5qSy2FRV41xCTo5NgD4EBsmq9mWFyqWUQ=; b=IHAh14t+KTzvApGSIgL3tdnIpHfrkiWnUEUwbQwz894Cv4vdZak3olccQ++qQ7unTxsqzt Z/YtPZXEdhxLa8pnpiaB5xJhGhUa2H+V0P9K9kRhfUT0btJjroTtJKcF8oaT7hf4RVrZWX BbZdG2ZbS3U97ISygS65ZAOgwU3Z5oghVa87LevnppJ1cLtFVdrqg3GrZBi+lHCjUfIjD7 Emi8w/3cJdU3bZzC8Zz7LKVZUFTT6RTplHF7VOQtW2l5TSaIjlRCNdQhycny5byqfCqfcV GvDaT0KByEZ7jQ8PXOPw2E4z5B5c1S2q69Oscv9a8BkwBkh+chvge0C1BqNHdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744741631; a=rsa-sha256; cv=none; b=aur/UzkT9wwd3vJQbw0x6GDKRHYwnyhm/aCsP/1cC9cWu7RZ/dDk7V7ZiDLZ+gpXNPqrGj wTQ05KT/y+Xd3g1NkiyV7GTPqfnvkvAJ30lLt8BPOD8Uv1oAOgko+UYapdIvw3i7BuIGzf IKPVEmvGo1ZR4J9Dv9BMET9yCiLwqhHCr7OUVspc3oFWPq+PIb6Fx6YWLfKPJhVdXOMO1A B4QrkY67FJhGzN+dP8Q6QGQwET+kCkamYH2BeHAKL70SyC3ujVwAnVz1/TgbuJZpxz5Lbs VtciLViRnSn8sriAIv1E8lDwpcaBmBnjefkV1nhOUYQgv1iDNfRuepIbrhCN0w== 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=1744741631; 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=hag0s75H7x5qSy2FRV41xCTo5NgD4EBsmq9mWFyqWUQ=; b=tIKSN5NaAoQ5KQga5L6uf71Dw775LkpyMO/o74qeoYx8a8jQSC5KeL3+X+QbB5LCBfjsGo AnDidXl03DDFa4lHjbM7+tEBCbEYQMCJk4Zhul2xPJxz3Td6irw29RxW8/7Eg8c4aiDulr lSqAj2DWxiItsANTGmqGkyzYY03k5FO9ZmaAa3+zcTuXcWvLGL+RnqH32UmoaCcHtExcPS xt7X/DrozjflO+P8jIXWJmTB/yexIKLjFaUr0hTj4L0LJeA3Wuy2j+Z32m02R4UVitPweD C03W5Hm2SwxhZbB2risqs8x8Ga3Y3vBTCC154N+m8gJhf3uPChTiMmMtkMT0Qg== 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 4ZcXgg1lY1zl3l; Tue, 15 Apr 2025 18:27:11 +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 53FIRB4i016277; Tue, 15 Apr 2025 18:27:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53FIRBS0016274; Tue, 15 Apr 2025 18:27:11 GMT (envelope-from git) Date: Tue, 15 Apr 2025 18:27:11 GMT Message-Id: <202504151827.53FIRBS0016274@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: 1bb8b1d7e190 - main - libdtrace: Fix formatting of messages about drops List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bb8b1d7e190d75597d31ab87364a058e8ef8c5b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1bb8b1d7e190d75597d31ab87364a058e8ef8c5b commit 1bb8b1d7e190d75597d31ab87364a058e8ef8c5b Author: Mark Johnston AuthorDate: 2025-04-15 14:03:47 +0000 Commit: Mark Johnston CommitDate: 2025-04-15 18:26:59 +0000 libdtrace: Fix formatting of messages about drops dt_oformat_drop() should only be called when in structured output mode. Reviewed by: Domagoj Stolfa Fixes: 93f27766a7e1 ("dtrace: Add the 'oformat' libdtrace option") --- .../opensolaris/lib/libdtrace/common/dt_aggregate.c | 16 ++++++++++------ .../opensolaris/lib/libdtrace/common/dt_consume.c | 19 +++++++++++++------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c index 1c3131e74cb0..e5d10ad5ac0a 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c @@ -472,14 +472,18 @@ dt_aggregate_snap_cpu(dtrace_hdl_t *dtp, processorid_t cpu) } if (buf->dtbd_drops != 0) { - xo_open_instance("probes"); - dt_oformat_drop(dtp, cpu); - if (dt_handle_cpudrop(dtp, cpu, - DTRACEDROP_AGGREGATION, buf->dtbd_drops) == -1) { + int error; + + if (dtp->dt_oformat) { + xo_open_instance("probes"); + dt_oformat_drop(dtp, cpu); + } + error = dt_handle_cpudrop(dtp, cpu, DTRACEDROP_AGGREGATION, + buf->dtbd_drops); + if (dtp->dt_oformat) xo_close_instance("probes"); + if (error != 0) return (-1); - } - xo_close_instance("probes"); } if (buf->dtbd_size == 0) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c index a760642c33bb..385c9d78bdfc 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c @@ -3678,10 +3678,13 @@ nextepid: */ buf->dtbd_drops = 0; - xo_open_instance("probes"); - dt_oformat_drop(dtp, cpu); + if (dtp->dt_oformat) { + xo_open_instance("probes"); + dt_oformat_drop(dtp, cpu); + } rval = dt_handle_cpudrop(dtp, cpu, DTRACEDROP_PRINCIPAL, drops); - xo_close_instance("probes"); + if (dtp->dt_oformat) + xo_close_instance("probes"); return (rval); } @@ -4187,11 +4190,15 @@ dtrace_consume(dtrace_hdl_t *dtp, FILE *fp, for (i = 0; i < max_ncpus; i++) { if (drops[i] != 0) { int error; - xo_open_instance("probes"); - dt_oformat_drop(dtp, i); + + if (dtp->dt_oformat) { + xo_open_instance("probes"); + dt_oformat_drop(dtp, i); + } error = dt_handle_cpudrop(dtp, i, DTRACEDROP_PRINCIPAL, drops[i]); - xo_close_instance("probes"); + if (dtp->dt_oformat) + xo_close_instance("probes"); if (error != 0) return (error); }