From nobody Sat Mar 14 14:03:46 2026 X-Original-To: dev-commits-src-branches@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 4fY3430G0Rz6VwcD 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 4fY3426lz5z3JX4 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=1773497026; 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=gFUrGFoHnW+3ChCjUI/FJ3z/CHnwx/c0eqv5YlP3LK8U7cNdTkWCeVV2m72FeiTISJW96X eep+2k+21bnfkwVc5niIGckv/K2skSOt7AIWufFu2VdH7kttzJI7Pr0A58DZQYUzGwcsLF v8kfPZSjpNTt4Mh5zgj2yFhbiQmo8w8LI4mWD/Pjs7Gtex/JKSBXxw+KcD3aVqpY2BvrsU 4XcirJ5pW7VtbJVG9XNTuAKHpNnPc3oTr2lnztvbhzYM3ulNGpNRjx0ggjRY9+I6AaPunq fMGH4ZxkL1+ZQpg1S/7/6UCTeOaBjQPmWQy2dPdHeLXcemw3kULk9NhVK7fzvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773497026; a=rsa-sha256; cv=none; b=XkAnIkfZDc2J2wJAPwdUOy2Q5JrTniKhIlouSHiKI6ZkXDO2AgLmxtSE9ocyphUAsnY/ys xXCfD8Gk5eMh1NylU1bqFqRZGFBIHddeEacq4vCb4pKe2PVYyZXq18Kt0V1wp+6J7qcPD2 jzU5nNJ0Vf+cn1k4qyrJ8PZUL7azj25kiU4LTLXlYKOz4ZUpAzIocuiBua8hEabtX1VeYD +VrBGsHGyIxgKmxUEA9h+EJl0jh0g82yX/GoUwGle1JObP11XPUJ5Q1sgAM8U7mILxqWT9 osQJXxZQdmuQroz6elr4wvvasJsUPEs+IEXUEhywncdnNpRqvxqJnYkd44MPKw== 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=1773497026; 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=EpesfKtnneKZ6dGjcL/YoAqjHjylyCUk+XQihjYIhJoKsOjgNEMN+5Itze9MtAVEpNhYi7 qzFxeFfeKEsyn4RjywGHZ9vv2WeGDjwGOaAQLBjIxE8DpV1j+I1YmXqnjNPR6gqOj/gsMZ CavDsi7t+hjI5Hjh6qp5+gs8KBNQl7SpQs4c7OqfpXU9Cv2e1D7qtwQIDUZgqpO+tDb01k 2P6C0O991IAyphYHA5wUC3Wpf60URQKxhaec+RL69ytQO24TzSB3wlXwuowU6hCNUb50QR rHpikUUUTESflHC3TrolJp4v76fbEfSwiMcMyO8HMUGs8wZV589RKceHua2Zvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fY3426Lclz1Kxb 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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)