WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the same
ClosedPublic
Actions

Authored by imp on May 30 2024, 8:56 PM.

Details

Reviewers

val_packett.cool
cy
adrian
olce

Commits

rG676041c41ba5: WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the same

Summary

Historically, these have been differnet values, and only one was defined
or they were defined as different values. Now that they are about to be
the same value, add #ifdef to cope.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

imp requested review of this revision.May 30 2024, 8:56 PM

imp created this revision.

Harbormaster completed remote builds in B57969: Diff 139235.May 30 2024, 8:56 PM

imp mentioned this in D39270: Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME.May 30 2024, 8:57 PM

imp added reviewers: val_packett.cool, cy, adrian.

I guess this has to be upstreamed (not familiar with WPA).

This revision is now accepted and ready to land.May 30 2024, 9:05 PM

adrian accepted this revision.May 30 2024, 9:06 PM

val_packett.cool accepted this revision.May 30 2024, 9:34 PM

Is the second ifdef change correct (or needed)? I think both clauses will get ifdef'd out this way if CLOCK_BOOTTIME == CLOCK_MONOTONIC.

In D45418#1036068, @mohd.akram_outlook.com wrote:

Is the second ifdef change correct (or needed)? I think both clauses will get ifdef'd out this way if CLOCK_BOOTTIME == CLOCK_MONOTONIC.

Oh, I think you're right. The original second #ifdef should be kept.

This revision now requires changes to proceed.May 31 2024, 2:13 PM

Simplify the #ifdefs, even though this is a bit longer than the prior
expressions.

Harbormaster completed remote builds in B57971: Diff 139256.May 31 2024, 2:16 PM