From nobody Sat Mar 7 23:46:37 2026 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 4fT0Kn25Gnz6TZFD for ; Sat, 07 Mar 2026 23:46:37 +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 4fT0Kn1VPxz3RP7 for ; Sat, 07 Mar 2026 23:46:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772927197; 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=l/GkThPIYRjsbhfwdgGo7r9qpyT9GQTlzbLey55fixk=; b=FRztx3gkaQFYvkaC5bKA/zWOjkLXRX7oKIw9YiZ7/dHV4PLnPPW2wGY9rPyODd00n6Sgqy LDRFBTMkurNHf/tPnLV+UUNT/9vAl5QzokLrr8vqUIAegb+xXQyKcv5HDMVzxycXeLaKe0 x6SbkqQRZ66yKj1aJSVaPYEcITa9GNSGmzhSp3LTuTlDx2qv7tfFSF+hIOTAP6ttbCjfPa 4+y7W14yBuIBGady/hEWLituTLDwPucEGz6os9bHZ8YWKhPs0iDqvZtyiqChPiMr/yccjt 5k2xFIofm6hYdG1UVA+PHY/CZiHPLSbT4ax1E70e6BckHCtxZ49eI1VRNslDVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772927197; a=rsa-sha256; cv=none; b=kSqwhRkcgbczRpS5aFrU6DVME84ftIjySAciV/1iweLlii2bgBOGnqfU4HPI5LxVH+a8vP qAlraZuj5SNjGYEcNP7v7/KNNDMBQ9b8P9vL2shkY22RyuDCf9d+oIq2Wi+JXy3svzIqVu OijGmwWRmc0c2t0BcFXqqq0bj5Wnzk4u6kcoFLzdpyOiN6k6mScgojzt0k/2zvAXtXhAtP ktW37RUal+zo3CANRwXMzlXBnvD2EPyZ6Hee//AerNwzcY7Qp4rsCU9854d8wcH/CXyK4V 4oAubEuCzGBLgSls6dQtVv5h61WDTfoTnqPY1nkGs6fRAiYUrLU1+F/pyuLv6Q== 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=1772927197; 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=l/GkThPIYRjsbhfwdgGo7r9qpyT9GQTlzbLey55fixk=; b=jxpoSgRu2FfaERBENfk9HDMU/4gH7enE44Q8ERrSoyKfY8QwUAT5+xa6IJX7JbkMRKCPrR rd8PSmJneSFzXQ3aV8B9JPmodnA7Jp5CbGREtnyHCfjN3wHLCCZwdTuREU+MFH/3x9cAWE qhPSc20GOrljGSCrADA48PrlmrDQGpVEkN4ug8hLYEA3fyh2Uam5FjZyWF/EYPitX/diBG tXvmdop2gCLdEYbbAgt4mILwoXEOZjSXI8uFlz0KhsS/8JpMMnqth9ztCGhemZmjBT0DJl XiqwunNA0cCTu0ZXWXUda2jLXBgobzuCMqiRIQnf2tm8zy5TP/1y4ctfJ47Ahw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fT0Kn14DDzVcD for ; Sat, 07 Mar 2026 23:46:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4643b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Mar 2026 23:46:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: e75c8faf277d - main - virtual_oss: Use virtual_oss_timestamp() to avoid duplication 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e75c8faf277dded0a80d469cb8182583716a2211 Auto-Submitted: auto-generated Date: Sat, 07 Mar 2026 23:46:37 +0000 Message-Id: <69acb8dd.4643b.44fc0e3b@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e75c8faf277dded0a80d469cb8182583716a2211 commit e75c8faf277dded0a80d469cb8182583716a2211 Author: Christos Margiolis AuthorDate: 2026-03-07 23:46:28 +0000 Commit: Christos Margiolis CommitDate: 2026-03-07 23:46:28 +0000 virtual_oss: Use virtual_oss_timestamp() to avoid duplication Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 5554ddb9a592..1d95c87d57b1 100644 --- a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c +++ b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c @@ -41,6 +41,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) { @@ -56,31 +68,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)