From nobody Sat Mar 14 14:03:46 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 4fY3430FDMz6Vwk9 for ; Sat, 14 Mar 2026 14:03:47 +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 4fY3426nSCz3JJP for ; Sat, 14 Mar 2026 14:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773497027; 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=KHWNqRgco4y/4NObMpLoc0yIkvGbq8cD3GoQPqLsUiE=; b=e4BafjXgNlSAjlMaoVc4kkYbuMPMG6Ni1LAHN/ikA4mvXjCkgxQiDa48puMmJI7K7gnjkF JVyCNxcky5TwR67BEOJhIxDChDbWJe3AxV82rhBSaPKx4Vb7re3yISkkusr55Qo2lEaLpg XsY5JjEU+vrF/+YyheKbBFhg6tHJsi8MqkCnMIifJPqkoTGEzH46Qd1vyvO1lAIiieT+yi kkZvdQUA5wFNtj4QUcOVJWd0FuFv/t05BsCwCuayxVz5e//zFtaRlpP7tE5m8Fd4baj/q/ ojupTwZeHhlnbhcETHZftwVtRJKEB4dIbSYNCIRj6fkUQQaSXUHwOdwRyTzd0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773497027; a=rsa-sha256; cv=none; b=YtkVBFMcnRyKZTh4rZvjh5I/J4wnJ4dkHhinhanr9zOPjxGjqqHiJZlh387SUg/dT99qyi kWvsYFJIpAfzUyogBHgZv1D7t7o8f83cM+dpsAFI+cdRjXYQSqN3TrHSwszXXtEPbE1dMz 4v0wD2xtYPzEIi6GPvAsgYrLD2J3+h1yhAFk7hFb17bRpTSEQRpQm9G63RzbaBUSryviYp OxsLXmfcuulhKb1kqZB23g+afkKn+pII+xlZJ4viRlnK/yh6nyrPaHYR1WrGxKUVrWvnbI RsQdIfG+ed2ENy4pEZm5hlx0LJ+v7Inp9wH6DnemSq4qONeMGbAegVmOxHGk3Q== 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=1773497027; 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=KHWNqRgco4y/4NObMpLoc0yIkvGbq8cD3GoQPqLsUiE=; b=kBcIeSSctxnvGQAHFTSh+0g5rUi4Amq5NoOzwg4ovoWYYVyADW+THIa13HrxVR7sHOImFH D/R2tZt32MN35dK7CNmm+Vv+M+yVBlI9BvgLCVJx1XpOgdN+ygFQFC2QQoPHIr4sGSWzIs VfvcSAbHTpR9hwwQwZsOi1++AMUIl/IoTWaoIR0QqgT5lU5sZ7u6bYsrtti+mSRsGrNDzt kf0CEWEDGsBAKsKHjhapQHCp/b3mfTh0GlxbyXvFEkgO0xz/N/JYTeiK3V7G/d4WyP0Lko RstwUEg9C/G0b3YrRFksGinAsL+9erbX99HBRISNpZjJ47lXPwxfRfxsmnvOaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fY3426M14z1KVX for ; Sat, 14 Mar 2026 14:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3db11 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 14:03:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 9c49c393a81b - stable/15 - virtual_oss: Use virtual_oss_timestamp() to avoid duplication 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/15 X-Git-Reftype: branch X-Git-Commit: 9c49c393a81bd47304ba76f26892faf4fc172d1c Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 14:03:46 +0000 Message-Id: <69b56ac2.3db11.7d95377c@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9c49c393a81bd47304ba76f26892faf4fc172d1c commit 9c49c393a81bd47304ba76f26892faf4fc172d1c Author: Christos Margiolis AuthorDate: 2026-03-07 23:46:28 +0000 Commit: Christos Margiolis CommitDate: 2026-03-14 14:03:30 +0000 virtual_oss: Use virtual_oss_timestamp() to avoid duplication Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit e75c8faf277dded0a80d469cb8182583716a2211) --- usr.sbin/virtual_oss/virtual_oss/virtual_oss.c | 29 ++++++++++++-------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c index fc7892df892c..18af38d8e7aa 100644 --- a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c +++ b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c @@ -39,6 +39,18 @@ #include "backend.h" #include "int.h" +uint64_t +virtual_oss_timestamp(void) +{ + struct timespec ts; + uint64_t nsec; + + clock_gettime(CLOCK_MONOTONIC, &ts); + + nsec = ts.tv_sec * 1000000000ULL + ts.tv_nsec; + return (nsec); +} + uint64_t virtual_oss_delay_ns(void) { @@ -54,31 +66,16 @@ virtual_oss_delay_ns(void) void virtual_oss_wait(void) { - struct timespec ts; uint64_t delay; uint64_t nsec; - clock_gettime(CLOCK_MONOTONIC, &ts); - - nsec = ts.tv_sec * 1000000000ULL + ts.tv_nsec; + nsec = virtual_oss_timestamp(); delay = virtual_oss_delay_ns(); usleep((delay - (nsec % delay)) / 1000); } -uint64_t -virtual_oss_timestamp(void) -{ - struct timespec ts; - uint64_t nsec; - - clock_gettime(CLOCK_MONOTONIC, &ts); - - nsec = ts.tv_sec * 1000000000ULL + ts.tv_nsec; - return (nsec); -} - static size_t vclient_read_linear(struct virtual_client *pvc, struct virtual_ring *pvr, int64_t *dst, size_t total) __requires_exclusive(atomic_mtx)