From nobody Mon Feb 27 22:12:21 2023 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 4PQZVZ00zLz3tDyb; Mon, 27 Feb 2023 22:12:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PQZVY6HRKz3QGc; Mon, 27 Feb 2023 22:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535941; 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=/VByvLWRu5uyICeOVyybLEB5fXgw4kWjXtEsDVm9j98=; b=f1u59Z6Ru019lg/9KSO3FxxoW4L7oAzyKi+3FI38CYUq5ksqz0roV9wNswIH7L9xbPLATL tbahNGy9T2WbQMjF1Nq6ND7pbo4jrZxdulCVCbv+okmBA4CwFxdIEQ9A9xad68d6wiZQJO VDRtTVzvSSr6rLIABwCoxlcyBZmAl+WOyIBuvUc2u9dNuyCpoSU9RrI7fcMHdauecxX7qe ieCFizDgnWzwHKurUh8hww23ZQQdQnHsNCQW4UORdiZYmztCjCiu8KgJxskGZi7xHy5PxR 3A/NL7KU5HAj2YDbjyk0nYezgru3naVjKG0bC3QIQlQ09RE2Q1uN0QHhDQ29Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535941; 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=/VByvLWRu5uyICeOVyybLEB5fXgw4kWjXtEsDVm9j98=; b=T2uzMNgsOLc3y9jB0RJPidQUmMqcWk1tWDI03ejH/tJIMzU3epoS8ua+5L8hW82mdsJGGX qCkfwEcy7E6FXplRz8Pfp4Q2Fgg93CkGcM8EMxs3wcqbjtQgXyjg3jm3MmYzcyfkJErM0e z/8tcGvK0n+5KM13YrKH9ytBATV13RfxERdM/yZoPcVK3cqo4/D9k8vPrOScQQWuAhWUZP e7s56f2IZN1Ofu3RFFwB2j8QG8byjxNwUUntivCcg5NiUfOlyQcNnZCOz7eMaaT5r/Ph9a YGrtDqoX9sdz1dl0xawAosGwPvx4k9Nhf+swW3G3xICZudyFQqOIGiluOfyTYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677535941; a=rsa-sha256; cv=none; b=SX+QTwHTdA7p0ERLp0natxoks6pc29P66m8q3NRQ5iwylM4oX9siqCfpKvOQjwQy2RZy2a JTwABHW7kAZIBttLFEEQe4du3yee6JSVFjqj+5k3/CXlz4mMJ1gTe6Y8Hx2Z1kwb9xYkIV eAMdkGpJa5Feu2ORwlWtVMmxIxC89nSybkEKd89EvMVDQTw2IQoUX1VS+MYPqahGWPRlyA 0abFyLJ8dTpnOJkbtKzKgtXurRJJD9T0xse3OAXVcrIDG1KbL/DUqXnDg0pUjPcK9sRzln CHmueTNzi+DLgpq00Y60g+K5mx6d2SxDNiaxUUW0yfecmRTfEhUWqL9eqQuwyw== 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 4PQZVY5NBHzjXk; Mon, 27 Feb 2023 22:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31RMCLqO028838; Mon, 27 Feb 2023 22:12:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RMCL3G028837; Mon, 27 Feb 2023 22:12:21 GMT (envelope-from git) Date: Mon, 27 Feb 2023 22:12:21 GMT Message-Id: <202302272212.31RMCL3G028837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8a142484d4c1 - main - pps: Directly assign the timestamps in pps_event() 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a142484d4c1d64b00a10e79fb4eb8b9f8d6c68d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8a142484d4c1d64b00a10e79fb4eb8b9f8d6c68d commit 8a142484d4c1d64b00a10e79fb4eb8b9f8d6c68d Author: Sebastian Huber AuthorDate: 2023-02-27 21:49:09 +0000 Commit: Warner Losh CommitDate: 2023-02-27 22:10:55 +0000 pps: Directly assign the timestamps in pps_event() Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/604 --- sys/kern/kern_tc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index b625726123af..be564e4347f8 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -1860,8 +1860,7 @@ pps_event(struct pps_state *pps, int event) tcount = pps->capcount - tcount; tcount &= captc->tc_counter_mask; bintime_addx(&bt, capth_scale * tcount); - bintime2timespec(&bt, &ts); - *tsp = ts; + bintime2timespec(&bt, tsp); if (foff) { timespecadd(tsp, osp, tsp); @@ -1876,9 +1875,8 @@ pps_event(struct pps_state *pps, int event) bt = pps->capffth->tick_time; ffclock_convert_delta(tcount, pps->capffth->cest.period, &bt); bintime_add(&bt, &pps->capffth->tick_time); - bintime2timespec(&bt, &ts); (*pseq_ffc)++; - *tsp_ffc = ts; + bintime2timespec(&bt, tsp_ffc); #endif #ifdef PPS_SYNC