From nobody Tue Mar 10 21:03:57 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 4fVmZk1k4zz6V3Wj for ; Tue, 10 Mar 2026 21:03:58 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVmZk0mlTz3NTh for ; Tue, 10 Mar 2026 21:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773176638; 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=eJK1drnuOGvdPQz/GfQS6HD71P0KYgfiulwG5CVE/5Q=; b=JRN9qxCN8vdEDvGShhQGBn8HVjJFXAurEA31FxhbwyYKfpBpQq0QeTUCgfQf6SP6GVhVkv Jr54o2bimWM7bc0UNfTEHDBNwVxpipkJFz3mP114X+26yRBcdc7v8eIzh36AVWLA/8D94U VGdJXZascVfDwROG9eC2W++YSWJTexi9pAUN5R1uOeNDTrp8geFMhv1cuKJ8RNRydut8nD MDA3nE7cEu3CmNAy70uIRUMMP7sQbLb6nhJbxFxNPt4fJpyMWvfutLlSI9UKYXMUGiwjmO wpcqYesY3xMmnts+ClVn6gnCVb/ZoT9NKA+lUjoxcMWDpClZkDTxy+l08NB7wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773176638; a=rsa-sha256; cv=none; b=mUCiUT+7zmPTyNu8eFWGAWdsVVtRdiWcYWiRxjwVaEXyvQekb9myhWA5nwtIGOaRpkKNL/ eToC9nHYCgiE7JRUh5uFBojxxhPdy6I39bvNItqte6nYn9CNoeyYEFScTZfpH15nniYBVS hgJlvYY9gKOBO6hbcudWmfeZsfoBD86rJ+vETljOSu3YWuanMkhM1IOmf8CE/0byy/c21k xvl6yzdKUgi2+4u7PosRp1r0BwyHmmegQnFlGgnEnLp8ZeRl8q+nDPjCRU9zRYX0kZiQxo 6qsFMM/jHWyY3/R6/B9uB2oeReIAfYA2UJDEFNAMGKGzmXHsBSN0lacQI+mzIQ== 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=1773176638; 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=eJK1drnuOGvdPQz/GfQS6HD71P0KYgfiulwG5CVE/5Q=; b=mR7u8yh5OsMUZzoVOEAKoOq8gwYRMt84YYyUofk9/xwAMabEd4qxYca9amDNEJFoWPo+px nbGN0ZdnrqFZrmYIpmOKfIYCQ3kFqJsv9WnI4DCk81y9Eg0iGiIPRyX+MkdxRPhngvdlJx 2tTLWj1qZPrLT9fSThheL1s6h/jwiNuwYyF8DiBG+PhR+fpzZXb5FzgVk42FoyX2GPZ83e HJMMGVjaSwu+O+3n5md05SScW8zsL8qcD7HEPvyPbeWAk/nVIDU95X4DjrBFFjLiD72jPw veBIR5BgmP5R/hRlEmFdr7d3ZNnfveGtptp2mkSVb4YoZe2W3jHYlNoeIbSf4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVmZj73zxzCLP for ; Tue, 10 Mar 2026 21:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38322 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 21:03:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 35b976c6ce61 - main - tests/kern/ssl_sendfile: reduce copy & paste 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35b976c6ce6145678ab378b21fdeab687a0a76d5 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 21:03:57 +0000 Message-Id: <69b0873d.38322.74eb5f2d@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=35b976c6ce6145678ab378b21fdeab687a0a76d5 commit 35b976c6ce6145678ab378b21fdeab687a0a76d5 Author: Gleb Smirnoff AuthorDate: 2026-03-10 17:36:21 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-10 21:02:40 +0000 tests/kern/ssl_sendfile: reduce copy & paste Provide sendme_locked_wait() for a common pattern. Not functional change. --- tests/sys/kern/ssl_sendfile.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/sys/kern/ssl_sendfile.c b/tests/sys/kern/ssl_sendfile.c index 884079e80be5..066674f5fb03 100644 --- a/tests/sys/kern/ssl_sendfile.c +++ b/tests/sys/kern/ssl_sendfile.c @@ -252,6 +252,14 @@ sendme_locked(struct ctx *c, off_t offset, size_t size, bool nb) ATF_REQUIRE(pthread_cond_signal(&c->cv) == 0); } +static void +sendme_locked_wait(struct ctx *c, off_t offset, size_t size, bool nb) +{ + sendme_locked(c, offset, size, nb); + while (c->state != READY) + ATF_REQUIRE(pthread_cond_wait(&c->cv, &c->mtx) == 0); +} + static void sendme(struct ctx *c, off_t offset, size_t size, bool nb) { @@ -454,9 +462,7 @@ ATF_TC_BODY(eagain_vs_eof, tc) * socket. Internall sendfile(2) returns -1 and errno == EAGAIN. */ ATF_REQUIRE(pthread_mutex_lock(&c.mtx) == 0); - sendme_locked(&c, 0, FSIZE, true); - while (c.state != READY) - ATF_REQUIRE(pthread_cond_wait(&c.cv, &c.mtx) == 0); + sendme_locked_wait(&c, 0, FSIZE, true); ATF_REQUIRE(c.sbytes > 0); ATF_REQUIRE(SSL_get_error(c.srv, c.sbytes) == 0); #if 0 /* see https://github.com/openssl/openssl/issues/29742 */ @@ -466,9 +472,7 @@ ATF_TC_BODY(eagain_vs_eof, tc) /* * Exercise second attempt on already full buffer. */ - sendme_locked(&c, 0, FSIZE, true); - while (c.state != READY) - ATF_REQUIRE(pthread_cond_wait(&c.cv, &c.mtx) == 0); + sendme_locked_wait(&c, 0, FSIZE, true); ATF_REQUIRE(c.sbytes == -1); ATF_REQUIRE(SSL_get_error(c.srv, c.sbytes) == SSL_ERROR_WANT_WRITE); ATF_REQUIRE(BIO_should_retry(SSL_get_wbio(c.srv))); @@ -489,9 +493,7 @@ ATF_TC_BODY(eagain_vs_eof, tc) * legitimate one. This test just documents the existing behavior * rather than asserts that this is a correct behavior. */ - sendme_locked(&c, FSIZE, 0, true); - while (c.state != READY) - ATF_REQUIRE(pthread_cond_wait(&c.cv, &c.mtx) == 0); + sendme_locked_wait(&c, FSIZE, 0, true); ATF_REQUIRE(c.sbytes == 0); ATF_REQUIRE(SSL_get_error(c.srv, c.sbytes) == SSL_ERROR_SYSCALL); #if 0 /* see https://github.com/openssl/openssl/issues/29742 */ @@ -501,9 +503,7 @@ ATF_TC_BODY(eagain_vs_eof, tc) /* * Exercise short write due to end of file. */ - sendme_locked(&c, FSIZE - 100, 0, true); - while (c.state != READY) - ATF_REQUIRE(pthread_cond_wait(&c.cv, &c.mtx) == 0); + sendme_locked_wait(&c, FSIZE - 100, 0, true); ATF_REQUIRE(c.sbytes == 100); ATF_REQUIRE(SSL_get_error(c.srv, c.sbytes) == 0); #if 0 /* see https://github.com/openssl/openssl/issues/29742 */