From nobody Sun Sep 22 02:10:27 2024 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 4XB8jH6rlbz5XM10; Sun, 22 Sep 2024 02:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XB8jH4zYnz4Rl9; Sun, 22 Sep 2024 02:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726971027; 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=7ul5fVUCWOpFVIO3aCAiUSdKZs+hXaLjHYCfNchQffw=; b=lx8BbC1ebECRXBRrXJAFJRl2Lf7XnZKc2wI5hoK8K+YVggipyQ/ZaVCCsHv6r+kUN7viSw Q7v81LD/v7JjAiSeh6wxfVXLpHpghwYAuyvvSstCQMc6fBxIllF8EgbVtGv5Jol2A3zh8i dXOfXD5IMuR2QqqoOBFlqH7PqUnLgZS6SdJuTkyJNSjgPBUmlMc31oOTeyY8eHUZ/+7Pu4 sFGJzHlTXO3Q8Ur99vGSH26OSEsEyKqjkuHrj57NjNPGeSjm4kKItRY2rpx7ley6LMcbOe tKeDloeNTEdsnJSuwafPcQEPBMIxqi5t72EhKCICwKelcBTPpQYWfo/SrhtEjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726971027; a=rsa-sha256; cv=none; b=hVbk9wDP19J1gNaikOarGLQWXq5QxqmHUHWEppwPmFXvvtLxlqkJJMF0CBdkBlQC2FF9Hp TMY9fMu0qIpGBCwRbRsq0t4DlGcUuZK9FBKXSo1JukqmAniOs5KHuGvMWorYW04keDV19z zod3CTfv/vnJeqA+LeUNH0Deyo6B3L2yxC/EX6KNg0WgwZGjuuemMHJLh6RHG5QOIKzqlu 2kb9EH1KbrLSM7vFzCIsFhs8psnmaL7Pf0jYzNS5+E2a0Of/pxNtoXg/m++l7VPzo2q5Iq 0oGENexNTl7X0hS5n0hj2m6deKlX9roNStgHh1JKqeCQ6HbPtDbKYowm3J2AaQ== 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=1726971027; 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=7ul5fVUCWOpFVIO3aCAiUSdKZs+hXaLjHYCfNchQffw=; b=bD/ENhHXZ0XN5iZR46T9qXl530H12InyWFrHaxLdhjr4xbl2JRnrC3cjIsici+lXv8M0gG ts81b1T9hdW6Tm7SHSJ7BjQ6PqW9oYMtTG5l664puqiYBEoJeLi6Tmm6xccgWH0m8Qmlrh vyCfeiJY+iopKChABfm7wdmMIG36d3VwL/rnl5HE1shNx97xmSqV27aWqnvQmXUaJdOG2Y 4sLBaKXlkCosZKy6O1tBiVh9tt5ByJSvHsodwHOZzyqq6RVBhYkDK11klgOzvZjpKBKGC3 uO5KL8rbX2iY6uzBKoL4h2xkHVJIrSkADZ40hfaSndLClMIvDElmOLc7o7eLvQ== 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 4XB8jH4V6Nzy8n; Sun, 22 Sep 2024 02:10: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 48M2AR4L044580; Sun, 22 Sep 2024 02:10:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48M2ARBB044577; Sun, 22 Sep 2024 02:10:27 GMT (envelope-from git) Date: Sun, 22 Sep 2024 02:10:27 GMT Message-Id: <202409220210.48M2ARBB044577@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: b90ba458dcae - main - iflib: Prefer C99's __func__ over GCC's __FUNCTION__ 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b90ba458dcaecc4041e008b99fde003bc9867a0d Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b90ba458dcaecc4041e008b99fde003bc9867a0d commit b90ba458dcaecc4041e008b99fde003bc9867a0d Author: Zhenlei Huang AuthorDate: 2024-09-22 02:07:38 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-22 02:07:38 +0000 iflib: Prefer C99's __func__ over GCC's __FUNCTION__ MFC after: 3 days --- sys/net/iflib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index a595a5f2dd0f..ca9610ae3809 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -3874,7 +3874,7 @@ iflib_completed_tx_reclaim(iflib_txq_t txq, int thresh) if (reclaim <= thresh /* + MAX_TX_DESC(txq->ift_ctx) */) { #ifdef INVARIANTS if (iflib_verbose_debug) { - printf("%s processed=%ju cleaned=%ju tx_nsegments=%d reclaim=%d thresh=%d\n", __FUNCTION__, + printf("%s processed=%ju cleaned=%ju tx_nsegments=%d reclaim=%d thresh=%d\n", __func__, txq->ift_processed, txq->ift_cleaned, txq->ift_ctx->ifc_softc_ctx.isc_tx_nsegments, reclaim, thresh); } @@ -3980,7 +3980,7 @@ iflib_txq_drain(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx) count = MIN(avail, TX_BATCH_SIZE); #ifdef INVARIANTS if (iflib_verbose_debug) - printf("%s avail=%d ifc_flags=%x txq_avail=%d ", __FUNCTION__, + printf("%s avail=%d ifc_flags=%x txq_avail=%d ", __func__, avail, ctx->ifc_flags, TXQ_AVAIL(txq)); #endif do_prefetch = (ctx->ifc_flags & IFC_PREFETCH);