From nobody Fri May 31 16:00:12 2024 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 4VrSWM1J77z5N6n7; Fri, 31 May 2024 16:00:15 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrSWM0RS2z3x57; Fri, 31 May 2024 16:00:15 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id D1GqsRb0N2Ui5D4fusBjkE; Fri, 31 May 2024 16:00:14 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id D4fssCjpOpsbgD4ftsx2e5; Fri, 31 May 2024 16:00:14 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=Ff+Ux4+6 c=1 sm=1 tr=0 ts=6659f40e a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=TpHVaj0NuXgA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=f3Yg3hO_8iQK3PizN4cA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 357FD5C; Fri, 31 May 2024 09:00:12 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 2D5AE111; Fri, 31 May 2024 09:00:12 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Warner Losh cc: Cy Schubert , Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 676041c41ba5 - main - WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the same In-reply-to: References: <202405311447.44VEl06w078151@gitrepo.freebsd.org> <20240531152819.33B6597@slippy.cwsent.com> Comments: In-reply-to Warner Losh message dated "Fri, 31 May 2024 11:48:36 -0400." 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=us-ascii Date: Fri, 31 May 2024 09:00:12 -0700 Message-Id: <20240531160012.2D5AE111@slippy.cwsent.com> X-CMAE-Envelope: MS4xfLqzDKyugAIrCP8DU3oeyMUcUYvge/RuLk6hrVQDtKPx9k/sUqnlPCgeP4G0QIzojLpcbe8u9AIiyM34RWUiaqDjGGZV95l6lCv7kcOZp7rzEo30qa/L N9kg4b5g0hyo+DY2gS3qmYLhh4pdzVn6vE+tksh921XOQv9FTByDB4r2zvlr3IVgMoLZsbBDm1UMgc08DVJXUKdcbleO75Km+0MLljsp03kU4ls6xdVRLywS 5HwqAhfe1FmEQ+WaRWWowPTDZGDQrlguxdfqO+aChsFpir8DtGlUQJ/Wm7WRcrCrnaKOHW/JviVQ5cqGvGGZ/q2KdBVelzLKJRm27W6PSiyuCKqs6EoFa92d VTgIeePe X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4VrSWM0RS2z3x57 In message , Warner Losh writes: > --00000000000056c22d0619c1eb4c > Content-Type: text/plain; charset="UTF-8" > Content-Transfer-Encoding: quoted-printable > > On Fri, May 31, 2024 at 11:28=E2=80=AFAM Cy Schubert .com> > wrote: > > > In message <202405311447.44VEl06w078151@gitrepo.freebsd.org>, Warner Losh > > write > > s: > > > The branch main has been updated by imp: > > > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=3D676041c41ba587285bb934aa2fca290= > e > > > a7208038 > > > > > > commit 676041c41ba587285bb934aa2fca290ea7208038 > > > Author: Warner Losh > > > AuthorDate: 2024-05-31 14:44:55 +0000 > > > Commit: Warner Losh > > > CommitDate: 2024-05-31 14:44:55 +0000 > > > > > > WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the same > > > > > > Historically, these have been differnet values, and only one was > > defined > > > or they were defined as different values. Now that they are about t= > o > > be > > > the same value, add #ifdef to cope. > > > > > > Sponsored by: Netflix > > > Reviewed by: olce, val_packett.cool, adrian > > > Differential Revision: https://reviews.freebsd.org/D45418 > > > --- > > > contrib/wpa/src/utils/os_unix.c | 11 ++++++++--- > > > 1 file changed, 8 insertions(+), 3 deletions(-) > > > > > > diff --git a/contrib/wpa/src/utils/os_unix.c > > b/contrib/wpa/src/utils/os_unix. > > > c > > > index 315c973f3228..a856179fb3b1 100644 > > > --- a/contrib/wpa/src/utils/os_unix.c > > > +++ b/contrib/wpa/src/utils/os_unix.c > > > @@ -72,7 +72,6 @@ int os_get_time(struct os_time *t) > > > return res; > > > } > > > > > > - > > > int os_get_reltime(struct os_reltime *t) > > > { > > > #ifndef __MACH__ > > > @@ -97,15 +96,21 @@ int os_get_reltime(struct os_reltime *t) > > > return 0; > > > } > > > switch (clock_id) { > > > -#ifdef CLOCK_BOOTTIME > > > +#if defined(CLOCK_BOOTTIME) > > > > Why this change? This could become a potential merge conflict next time > > WPA > > is MFVed. > > > > Oh, that was a mistake. > > > > > case CLOCK_BOOTTIME: > > > clock_id =3D CLOCK_MONOTONIC; > > > break; > > > #endif > > > -#ifdef CLOCK_MONOTONIC > > > +#if defined(CLOCK_MONOTONIC) > > > > Ditto. > > > > Ditto. I iterated on these changes and thought I'd restored them to the > original. I'll do a followup diff minimization diff. > > > > > > +/* > > > + * FreeBSD has both BOOTTIME and MONOTONIC defined to the same value, > > since > > > they > > > + * mean the same thing. FreeBSD 14.1 and ealier don't, so need this > > case. > > > + */ > > > +#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME =3D=3D CLOCK_MONOTONIC= > ) > > > > This I probably want to apply to the ports. > > > > Yes. I had you on the review, but I did move kinda quickly on this, and so That was my fault. My MH review folder is large and with all the things going on here I failed to cherry-pick this one out of that folder. This is totally on me, I'm sorry. > those ports > are likely broken by the change in FreeBSD. My apologies. No apologies necessary. As long as I know what can be kept and what can be overwritten next time WPA is MFVed. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0