Skip to content

Commit fd4fe30

Browse files
borsbors
committed
Auto merge of #2545 - JohnTitor:freebsd-14-ci, r=JohnTitor
Add FreeBSD 14 CI r? `@ghost`
2 parents 83ffbee + 9f350fc commit fd4fe30

File tree

12 files changed

+791
-114
lines changed

12 files changed

+791
-114
lines changed

‎.cirrus.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,17 @@ task:
4040
- . $HOME/.cargo/env
4141
- LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd
4242
- sh ci/run.sh x86_64-unknown-freebsd
43+
44+
task:
45+
name: nightly x86_64-unknown-freebsd-14
46+
freebsd_instance:
47+
image: freebsd-14-0-current-amd64-v20211111
48+
setup_script:
49+
- pkg install -y curl
50+
- curl https://sh.rustup.rs -sSf --output rustup.sh
51+
- sh rustup.sh -y --default-toolchain nightly --profile=minimal
52+
- . $HOME/.cargo/env
53+
test_script:
54+
- . $HOME/.cargo/env
55+
- LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd
56+
- sh ci/run.sh x86_64-unknown-freebsd

‎build.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ fn main() {
3131
Some(11) if libc_ci => println!("cargo:rustc-cfg=freebsd11"),
3232
Some(12) if libc_ci => println!("cargo:rustc-cfg=freebsd12"),
3333
Some(13) if libc_ci => println!("cargo:rustc-cfg=freebsd13"),
34+
Some(14) if libc_ci => println!("cargo:rustc-cfg=freebsd14"),
3435
Some(_) | None => println!("cargo:rustc-cfg=freebsd11"),
3536
}
3637

@@ -150,6 +151,7 @@ fn which_freebsd() -> Option<i32> {
150151
s if s.starts_with("11") => Some(11),
151152
s if s.starts_with("12") => Some(12),
152153
s if s.starts_with("13") => Some(13),
154+
s if s.starts_with("14") => Some(14),
153155
_ => None,
154156
}
155157
}

‎libc-test/build.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1761,6 +1761,7 @@ fn test_freebsd(target: &str) {
17611761
Some(11) => cfg.cfg("freebsd11", None),
17621762
Some(12) => cfg.cfg("freebsd12", None),
17631763
Some(13) => cfg.cfg("freebsd13", None),
1764+
Some(14) => cfg.cfg("freebsd14", None),
17641765
_ => &mut cfg,
17651766
};
17661767

@@ -3381,6 +3382,7 @@ fn which_freebsd() -> Option<i32> {
33813382
s if s.starts_with("11") => Some(11),
33823383
s if s.starts_with("12") => Some(12),
33833384
s if s.starts_with("13") => Some(13),
3385+
s if s.starts_with("14") => Some(14),
33843386
_ => None,
33853387
}
33863388
}

‎src/unix/bsd/freebsdlike/dragonfly/mod.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,6 +1299,8 @@ pub const SF_XLINK: ::c_ulong = 0x01000000;
12991299
pub const UTIME_OMIT: c_long = -2;
13001300
pub const UTIME_NOW: c_long = -1;
13011301

1302+
pub const MINCORE_SUPER: ::c_int = 0x20;
1303+
13021304
const_fn! {
13031305
{const} fn _CMSG_ALIGN(n: usize) -> usize {
13041306
(n + 3) & !3

‎src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,103 @@ s! {
2929
pub shm_dtime: ::time_t,
3030
pub shm_ctime: ::time_t,
3131
}
32+
33+
pub struct kinfo_proc {
34+
pub ki_structsize: ::c_int,
35+
pub ki_layout: ::c_int,
36+
pub ki_args: *mut ::pargs,
37+
// This is normally "struct proc".
38+
pub ki_paddr: *mut ::c_void,
39+
// This is normally "struct user".
40+
pub ki_addr: *mut ::c_void,
41+
// This is normally "struct vnode".
42+
pub ki_tracep: *mut ::c_void,
43+
// This is normally "struct vnode".
44+
pub ki_textvp: *mut ::c_void,
45+
// This is normally "struct filedesc".
46+
pub ki_fd: *mut ::c_void,
47+
// This is normally "struct vmspace".
48+
pub ki_vmspace: *mut ::c_void,
49+
pub ki_wchan: *mut ::c_void,
50+
pub ki_pid: ::pid_t,
51+
pub ki_ppid: ::pid_t,
52+
pub ki_pgid: ::pid_t,
53+
pub ki_tpgid: ::pid_t,
54+
pub ki_sid: ::pid_t,
55+
pub ki_tsid: ::pid_t,
56+
pub ki_jobc: ::c_short,
57+
pub ki_spare_short1: ::c_short,
58+
pub ki_tdev: ::dev_t,
59+
pub ki_siglist: ::sigset_t,
60+
pub ki_sigmask: ::sigset_t,
61+
pub ki_sigignore: ::sigset_t,
62+
pub ki_sigcatch: ::sigset_t,
63+
pub ki_uid: ::uid_t,
64+
pub ki_ruid: ::uid_t,
65+
pub ki_svuid: ::uid_t,
66+
pub ki_rgid: ::gid_t,
67+
pub ki_svgid: ::gid_t,
68+
pub ki_ngroups: ::c_short,
69+
pub ki_spare_short2: ::c_short,
70+
pub ki_groups: [::gid_t; ::KI_NGROUPS],
71+
pub ki_size: ::vm_size_t,
72+
pub ki_rssize: ::segsz_t,
73+
pub ki_swrss: ::segsz_t,
74+
pub ki_tsize: ::segsz_t,
75+
pub ki_dsize: ::segsz_t,
76+
pub ki_ssize: ::segsz_t,
77+
pub ki_xstat: ::u_short,
78+
pub ki_acflag: ::u_short,
79+
pub ki_pctcpu: ::fixpt_t,
80+
pub ki_estcpu: ::u_int,
81+
pub ki_slptime: ::u_int,
82+
pub ki_swtime: ::u_int,
83+
pub ki_cow: ::u_int,
84+
pub ki_runtime: u64,
85+
pub ki_start: ::timeval,
86+
pub ki_childtime: ::timeval,
87+
pub ki_flag: ::c_long,
88+
pub ki_kiflag: ::c_long,
89+
pub ki_traceflag: ::c_int,
90+
pub ki_stat: ::c_char,
91+
pub ki_nice: i8, // signed char
92+
pub ki_lock: ::c_char,
93+
pub ki_rqindex: ::c_char,
94+
pub ki_oncpu_old: ::c_uchar,
95+
pub ki_lastcpu_old: ::c_uchar,
96+
pub ki_tdname: [::c_char; ::TDNAMLEN + 1],
97+
pub ki_wmesg: [::c_char; ::WMESGLEN + 1],
98+
pub ki_login: [::c_char; ::LOGNAMELEN + 1],
99+
pub ki_lockname: [::c_char; ::LOCKNAMELEN + 1],
100+
pub ki_comm: [::c_char; ::COMMLEN + 1],
101+
pub ki_emul: [::c_char; ::KI_EMULNAMELEN + 1],
102+
pub ki_loginclass: [::c_char; ::LOGINCLASSLEN + 1],
103+
pub ki_moretdname: [::c_char; ::MAXCOMLEN - ::TDNAMLEN + 1],
104+
pub ki_sparestrings: [[::c_char; 23]; 2], // little hack to allow PartialEq
105+
pub ki_spareints: [::c_int; ::KI_NSPARE_INT],
106+
pub ki_oncpu: ::c_int,
107+
pub ki_lastcpu: ::c_int,
108+
pub ki_tracer: ::c_int,
109+
pub ki_flag2: ::c_int,
110+
pub ki_fibnum: ::c_int,
111+
pub ki_cr_flags: ::u_int,
112+
pub ki_jid: ::c_int,
113+
pub ki_numthreads: ::c_int,
114+
pub ki_tid: ::lwpid_t,
115+
pub ki_pri: ::priority,
116+
pub ki_rusage: ::rusage,
117+
pub ki_rusage_ch: ::rusage,
118+
// This is normally "struct pcb".
119+
pub ki_pcb: *mut ::c_void,
120+
pub ki_kstack: *mut ::c_void,
121+
pub ki_udata: *mut ::c_void,
122+
// This is normally "struct thread".
123+
pub ki_tdaddr: *mut ::c_void,
124+
pub ki_spareptrs: [*mut ::c_void; ::KI_NSPARE_PTR],
125+
pub ki_sparelongs: [::c_long; ::KI_NSPARE_LONG],
126+
pub ki_sflag: ::c_long,
127+
pub ki_tdflags: ::c_long,
128+
}
32129
}
33130

34131
s_no_extra_traits! {
@@ -192,6 +289,7 @@ cfg_if! {
192289
pub const ELAST: ::c_int = 96;
193290
pub const RAND_MAX: ::c_int = 0x7fff_fffd;
194291
pub const KI_NSPARE_PTR: usize = 6;
292+
pub const MINCORE_SUPER: ::c_int = 0x20;
195293

196294
extern "C" {
197295
// Return type ::c_int was removed in FreeBSD 12

‎src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,104 @@ s! {
3636
pub offset: ::u_long,
3737
pub len: ::size_t,
3838
}
39+
40+
pub struct kinfo_proc {
41+
pub ki_structsize: ::c_int,
42+
pub ki_layout: ::c_int,
43+
pub ki_args: *mut ::pargs,
44+
// This is normally "struct proc".
45+
pub ki_paddr: *mut ::c_void,
46+
// This is normally "struct user".
47+
pub ki_addr: *mut ::c_void,
48+
// This is normally "struct vnode".
49+
pub ki_tracep: *mut ::c_void,
50+
// This is normally "struct vnode".
51+
pub ki_textvp: *mut ::c_void,
52+
// This is normally "struct filedesc".
53+
pub ki_fd: *mut ::c_void,
54+
// This is normally "struct vmspace".
55+
pub ki_vmspace: *mut ::c_void,
56+
pub ki_wchan: *mut ::c_void,
57+
pub ki_pid: ::pid_t,
58+
pub ki_ppid: ::pid_t,
59+
pub ki_pgid: ::pid_t,
60+
pub ki_tpgid: ::pid_t,
61+
pub ki_sid: ::pid_t,
62+
pub ki_tsid: ::pid_t,
63+
pub ki_jobc: ::c_short,
64+
pub ki_spare_short1: ::c_short,
65+
pub ki_tdev_freebsd11: u32,
66+
pub ki_siglist: ::sigset_t,
67+
pub ki_sigmask: ::sigset_t,
68+
pub ki_sigignore: ::sigset_t,
69+
pub ki_sigcatch: ::sigset_t,
70+
pub ki_uid: ::uid_t,
71+
pub ki_ruid: ::uid_t,
72+
pub ki_svuid: ::uid_t,
73+
pub ki_rgid: ::gid_t,
74+
pub ki_svgid: ::gid_t,
75+
pub ki_ngroups: ::c_short,
76+
pub ki_spare_short2: ::c_short,
77+
pub ki_groups: [::gid_t; ::KI_NGROUPS],
78+
pub ki_size: ::vm_size_t,
79+
pub ki_rssize: ::segsz_t,
80+
pub ki_swrss: ::segsz_t,
81+
pub ki_tsize: ::segsz_t,
82+
pub ki_dsize: ::segsz_t,
83+
pub ki_ssize: ::segsz_t,
84+
pub ki_xstat: ::u_short,
85+
pub ki_acflag: ::u_short,
86+
pub ki_pctcpu: ::fixpt_t,
87+
pub ki_estcpu: ::u_int,
88+
pub ki_slptime: ::u_int,
89+
pub ki_swtime: ::u_int,
90+
pub ki_cow: ::u_int,
91+
pub ki_runtime: u64,
92+
pub ki_start: ::timeval,
93+
pub ki_childtime: ::timeval,
94+
pub ki_flag: ::c_long,
95+
pub ki_kiflag: ::c_long,
96+
pub ki_traceflag: ::c_int,
97+
pub ki_stat: ::c_char,
98+
pub ki_nice: i8, // signed char
99+
pub ki_lock: ::c_char,
100+
pub ki_rqindex: ::c_char,
101+
pub ki_oncpu_old: ::c_uchar,
102+
pub ki_lastcpu_old: ::c_uchar,
103+
pub ki_tdname: [::c_char; ::TDNAMLEN + 1],
104+
pub ki_wmesg: [::c_char; ::WMESGLEN + 1],
105+
pub ki_login: [::c_char; ::LOGNAMELEN + 1],
106+
pub ki_lockname: [::c_char; ::LOCKNAMELEN + 1],
107+
pub ki_comm: [::c_char; ::COMMLEN + 1],
108+
pub ki_emul: [::c_char; ::KI_EMULNAMELEN + 1],
109+
pub ki_loginclass: [::c_char; ::LOGINCLASSLEN + 1],
110+
pub ki_moretdname: [::c_char; ::MAXCOMLEN - ::TDNAMLEN + 1],
111+
pub ki_sparestrings: [[::c_char; 23]; 2], // little hack to allow PartialEq
112+
pub ki_spareints: [::c_int; ::KI_NSPARE_INT],
113+
pub ki_tdev: ::dev_t,
114+
pub ki_oncpu: ::c_int,
115+
pub ki_lastcpu: ::c_int,
116+
pub ki_tracer: ::c_int,
117+
pub ki_flag2: ::c_int,
118+
pub ki_fibnum: ::c_int,
119+
pub ki_cr_flags: ::u_int,
120+
pub ki_jid: ::c_int,
121+
pub ki_numthreads: ::c_int,
122+
pub ki_tid: ::lwpid_t,
123+
pub ki_pri: ::priority,
124+
pub ki_rusage: ::rusage,
125+
pub ki_rusage_ch: ::rusage,
126+
// This is normally "struct pcb".
127+
pub ki_pcb: *mut ::c_void,
128+
pub ki_kstack: *mut ::c_void,
129+
pub ki_udata: *mut ::c_void,
130+
// This is normally "struct thread".
131+
pub ki_tdaddr: *mut ::c_void,
132+
pub ki_spareptrs: [*mut ::c_void; ::KI_NSPARE_PTR],
133+
pub ki_sparelongs: [::c_long; ::KI_NSPARE_LONG],
134+
pub ki_sflag: ::c_long,
135+
pub ki_tdflags: ::c_long,
136+
}
39137
}
40138

41139
s_no_extra_traits! {
@@ -207,6 +305,8 @@ pub const ELAST: ::c_int = 97;
207305
pub const SPECNAMELEN: ::c_int = 63;
208306
pub const KI_NSPARE_PTR: usize = 6;
209307

308+
pub const MINCORE_SUPER: ::c_int = 0x20;
309+
210310
extern "C" {
211311
pub fn setgrent();
212312
pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;

0 commit comments

Comments
 (0)