Page MenuHomeFreeBSD
Differential D44468

sys/acl.h: reduce header pollution
ClosedPublic
Actions

Authored by brooks on Mar 21 2024, 11:39 PM.
Tags
None
Referenced Files
Unknown Object (File)
Jan 23 2025, 11:33 AM
Unknown Object (File)
Jan 13 2025, 12:00 PM
Unknown Object (File)
Jan 9 2025, 8:06 AM
Unknown Object (File)
Jan 9 2025, 6:40 AM
Unknown Object (File)
Dec 9 2024, 4:16 AM
Unknown Object (File)
Nov 22 2024, 3:15 PM
Unknown Object (File)
Nov 8 2024, 7:11 PM
Unknown Object (File)
Nov 7 2024, 1:12 AM
View All 53 Files
Subscribers
None

Details

Reviewers
kib
imp
trasz
Commits
rGdcda49233de3: sys/acl.h: reduce header pollution
Summary

In commit d1dfd921774f0 the acl allocator was switch from malloc(9) to
uma(9) and done in a way required vm/uma.h and prerequisites. This added
considerable header pollution to sys/sysproto.h. The uma details were
hidden in commit b998d381f2868, but the header pollution remained. Add
an include of sys/malloc.h as required by commit ae1add4e55214 to keep
the header self contained.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 56743
Build 53631: arc lint + arc unit

Event Timeline

brooks requested review of this revision.Mar 21 2024, 11:39 PM
brooks created this revision.
Harbormaster completed remote builds in B56734: Diff 136056.Mar 21 2024, 11:39 PM
brooks added a parent revision: D44467: sysproto.h: sys/acl.h -> sys/types.h.Mar 21 2024, 11:39 PM
kib added a comment.Mar 22 2024, 3:15 AM

Also, to be really self-contained, the header needs at least either sys/_types.h or sys/types.h (not sure which).

sys/sys/acl.h
39–43

Can we limit this to _KERNEL?

brooks updated this revision to Diff 136101.Mar 22 2024, 8:24 PM
  • Put ifdef _KERNEL around sys/malloc.h include
  • Add sys/types.h and sys/_null.h
Harbormaster completed remote builds in B56743: Diff 136101.Mar 22 2024, 8:24 PM
brooks added a parent revision: D44474: acl_to_text: include sys/param.h for MAXLOGNAME.Mar 22 2024, 8:27 PM
kib accepted this revision.Mar 23 2024, 6:56 AM
This revision is now accepted and ready to land.Mar 23 2024, 6:56 AM
Closed by commit rGdcda49233de3: sys/acl.h: reduce header pollution (authored by brooks). · Explain WhyApr 15 2024, 8:44 PM
This revision was automatically updated to reflect the committed changes.
brooks marked an inline comment as done.
brooks added a commit: rGdcda49233de3: sys/acl.h: reduce header pollution.

Revision Contents
Changeset List

PathSize
sys/
sys/
8 lines

Diff 136101

View Options

sys/sys/acl.h

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Lines
.It Sy Type Ta Sy Size .It Sy Type Ta Sy Size
.It short Ta 2 .It short Ta 2
.It int Ta 4 .It int Ta 4
.It long Ta sizeof(void*) .It long Ta sizeof(void*)
.It long long Ta 8 .It long long Ta 8
.It float Ta 4 .It float Ta 4
.It double Ta 8 .It double Ta 8
.El .El
.Bl -column -offset indent ".Sy Architecture" ".Sy sizeof(void *)" ".Sy "sizeof(long double)" .Bl -column -offset indent "Sy Architecture" "Sy sizeof(void *)" "Sy "sizeof(long double)"
.It Sy Architecture Ta Sy sizeof(void *) Ta Sy sizeof(long double) .It Sy Architecture Ta Sy sizeof(void *) Ta Sy sizeof(long double)
.It amd64 Ta 8 Ta 16 .It amd64 Ta 8 Ta 16
.It arm Ta 4 Ta 8 .It arm Ta 4 Ta 8
.It armeb Ta 4 Ta 8 .It armeb Ta 4 Ta 8
.It armv6 Ta 4 Ta 8 .It armv6 Ta 4 Ta 8
.It arm64 Ta 8 Ta 16 .It arm64 Ta 8 Ta 16
.It i386 Ta 4 Ta 12 .It i386 Ta 4 Ta 12
.It mips Ta 4 Ta 8 .It mips Ta 4 Ta 8
.It mipsel Ta 4 Ta 8 .It mipsel Ta 4 Ta 8
.It mipsn32 Ta 4 Ta 8 .It mipsn32 Ta 4 Ta 8
.It mips64 Ta 8 Ta 8 .It mips64 Ta 8 Ta 8
.It mips64el Ta 8 Ta 8 .It mips64el Ta 8 Ta 8
.It powerpc Ta 4 Ta 8 .It powerpc Ta 4 Ta 8
.It powerpc64 Ta 8 Ta 8 .It powerpc64 Ta 8 Ta 8
.It riscv Ta 8 Ta .It riscv Ta 8 Ta
.It sparc64 Ta 8 Ta 16 .It sparc64 Ta 8 Ta 16
.El .El
.Ss Endianness and Char Signedness .Ss Endianness and Char Signedness
.Bl -column -offset indent ".Sy Architecture" ".Sy Endianness" ".Sy "char Signedness" .Bl -column -offset indent "Sy Architecture" "Sy Endianness" "Sy "char Signedness"
.It Sy Architecture Ta Sy Endianness Ta Sy char Signedness .It Sy Architecture Ta Sy Endianness Ta Sy char Signedness
.It amd64 Ta little Ta signed .It amd64 Ta little Ta signed
.It arm Ta little Ta unsigned .It arm Ta little Ta unsigned
.It armeb Ta big Ta unsigned .It armeb Ta big Ta unsigned
.It armv6 Ta little Ta unsigned .It armv6 Ta little Ta unsigned
.It arm64 Ta little Ta unsigned .It arm64 Ta little Ta unsigned
.It i386 Ta little Ta signed .It i386 Ta little Ta signed
.It mips Ta big Ta signed .It mips Ta big Ta signed
.It mipsel Ta little Ta signed .It mipsel Ta little Ta signed
.It mipsn32 Ta big Ta signed .It mipsn32 Ta big Ta signed
.It mips64 Ta big Ta signed .It mips64 Ta big Ta signed
.It mips64el Ta little Ta signed .It mips64el Ta little Ta signed
.It powerpc Ta big Ta unsigned .It powerpc Ta big Ta unsigned
.It powerpc64 Ta big Ta unsigned .It powerpc64 Ta big Ta unsigned
.It riscv Ta little Ta signed .It riscv Ta little Ta signed
.It sparc64 Ta big Ta signed .It sparc64 Ta big Ta signed
.El .El
.Ss Page Size .Ss Page Size
.Bl -column -offset indent ".Sy Architecture" ".Sy Page Sizes" .Bl -column -offset indent "Sy Architecture" "Sy Page Sizes"
.It Sy Architecture Ta Sy Page Sizes .It Sy Architecture Ta Sy Page Sizes
.It amd64 Ta 4K, 2M, 1G .It amd64 Ta 4K, 2M, 1G
.It arm Ta 4K .It arm Ta 4K
.It armeb Ta 4K .It armeb Ta 4K
.It armv6 Ta 4K, 1M .It armv6 Ta 4K, 1M
.It arm64 Ta 4K, 2M, 1G .It arm64 Ta 4K, 2M, 1G
.It i386 Ta 4K, 2M (PAE), 4M .It i386 Ta 4K, 2M (PAE), 4M
.It mips Ta 4K .It mips Ta 4K
.It mipsel Ta 4K .It mipsel Ta 4K
.It mipsn32 Ta 4K .It mipsn32 Ta 4K
.It mips64 Ta 4K .It mips64 Ta 4K
.It mips64el Ta 4K .It mips64el Ta 4K
.It powerpc Ta 4K .It powerpc Ta 4K
.It powerpc64 Ta 4K .It powerpc64 Ta 4K
.It riscv Ta 4K .It riscv Ta 4K
.It sparc64 Ta 8K .It sparc64 Ta 8K
.El .El
.Ss Floating Point .Ss Floating Point
.Bl -column -offset indent ".Sy Architecture" ".Sy float, double" ".Sy long double" .Bl -column -offset indent "Sy Architecture" "Sy float, double" "Sy long double"
.It Sy Architecture Ta Sy float, double Ta Sy long double .It Sy Architecture Ta Sy float, double Ta Sy long double
.It amd64 Ta hard Ta hard, 80 bit .It amd64 Ta hard Ta hard, 80 bit
.It arm Ta soft Ta soft, double precision .It arm Ta soft Ta soft, double precision
.It armeb Ta soft Ta soft, double precision .It armeb Ta soft Ta soft, double precision
.It armv6 Ta hard Ta hard, double precision .It armv6 Ta hard Ta hard, double precision
.It arm64 Ta hard Ta soft, quad precision .It arm64 Ta hard Ta soft, quad precision
.It i386 Ta hard Ta hard, 80 bit .It i386 Ta hard Ta hard, 80 bit
.It mips Ta soft Ta identical to double .It mips Ta soft Ta identical to double
Show All 12 Lines
Other macros, including those required by the language standard, are not Other macros, including those required by the language standard, are not
included here. included here.
.Pp .Pp
The full set of predefined macros can be obtained with this command: The full set of predefined macros can be obtained with this command:
.Bd -literal -offset indent .Bd -literal -offset indent
cc -x c -Dm -E /dev/null cc -x c -Dm -E /dev/null
.Ed .Ed
.Pp .Pp
Common type size and endianness macros: Common type size and endianness macros:
impUnsubmitted
Not Done
Inline Actions

Did you want to also clarify this is available only when sys/endian.h is included?

imp: Did you want to also clarify this is available only when sys/endian.h is included?
kibAuthorUnsubmitted
Not Done
Inline Actions

I want to leave the scope of this change to typesetting only.

Note that sys/endian.h is not the only such problem in the text. E.g. __ARM_ARCH requires machine/asle.h for older compilers.

kib: I want to leave the scope of this change to typesetting only. Note that sys/endian.h is not…
.Bl -column -offset indent "BYTE_ORDER" ".Sy Meaning" .Bl -column -offset indent "BYTE_ORDER" "Sy Meaning"
.It Sy Macro Ta Sy Meaning .It Sy Macro Ta Sy Meaning
.It Dv __LP64__ Ta 64-bit (8-byte) long and pointer, 32-bit (4-byte) int .It Dv __LP64__ Ta 64-bit (8-byte) long and pointer, 32-bit (4-byte) int
.It Dv __ILP32__ Ta 32-bit (4-byte) int, long and pointer .It Dv __ILP32__ Ta 32-bit (4-byte) int, long and pointer
.It Dv BYTE_ORDER Ta Either Dv BIG_ENDIAN or Dv LITTLE_ENDIAN . .It Dv BYTE_ORDER Ta Either Dv BIG_ENDIAN or Dv LITTLE_ENDIAN .
.Dv PDP11_ENDIAN is not used on FreeBSD. .Dv PDP11_ENDIAN
is not used on
baptUnsubmitted
Not Done
Inline Actions

Should be

.Fx

instead of hard coded FreeBSD

bapt: Should be ``` .Fx ``` instead of hard coded FreeBSD
.Fx .
.El .El
.Pp .Pp
Architecture-specific macros: Architecture-specific macros:
.Bl -column -offset indent ".Sy Architecture" ".Sy Predefined macros" .Bl -column -offset indent "Sy Architecture" "Sy Predefined macros"
.It Sy Architecture Ta Sy Predefined macros .It Sy Architecture Ta Sy Predefined macros
.It amd64 Ta Dv __amd64__, Dv __x86_64__ .It amd64 Ta Dv __amd64__, Dv __x86_64__
.It arm Ta Dv __arm__ .It arm Ta Dv __arm__
.It armeb Ta Dv __arm__ .It armeb Ta Dv __arm__
.It armv6 Ta Dv __arm__, Dv __ARM_ARCH >= 6 .It armv6 Ta Dv __arm__, Dv __ARM_ARCH >= 6
.It arm64 Ta Dv __aarch64__ .It arm64 Ta Dv __aarch64__
.It i386 Ta Dv __i386__ .It i386 Ta Dv __i386__
.It mips Ta Dv __mips__, Dv __MIPSEB__, Dv __mips_o32 .It mips Ta Dv __mips__, Dv __MIPSEB__, Dv __mips_o32
Show All 17 Lines