Skip to content

Commit 3684bd3

Browse files
committed
Auto merge of #2562 - devnexen:dfbsd_kinfo, r=JohnTitor
kinfo_cputime/kinfo_file addition for dragonfly
2 parents 89ead98 + 9f818b8 commit 3684bd3

File tree

3 files changed

+30
-0
lines changed

3 files changed

+30
-0
lines changed

libc-test/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,6 +1215,7 @@ fn test_dragonflybsd(target: &str) {
12151215
"sys/file.h",
12161216
"sys/ioctl.h",
12171217
"sys/ipc.h",
1218+
"sys/kinfo.h",
12181219
"sys/ktrace.h",
12191220
"sys/malloc.h",
12201221
"sys/mman.h",

libc-test/semver/dragonfly.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,6 +1292,8 @@ in6_pktinfo
12921292
initgroups
12931293
kevent
12941294
killpg
1295+
kinfo_cputime
1296+
kinfo_file
12951297
kqueue
12961298
labs
12971299
lastlog

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,33 @@ s! {
215215
pub shm_ctime: ::time_t,
216216
shm_internal: *mut ::c_void,
217217
}
218+
219+
pub struct kinfo_file {
220+
pub f_size: ::size_t,
221+
pub f_pid: ::pid_t,
222+
pub f_uid: ::uid_t,
223+
pub f_fd: ::c_int,
224+
pub f_file: *mut ::c_void,
225+
pub f_type: ::c_short,
226+
pub f_count: ::c_int,
227+
pub f_msgcount: ::c_int,
228+
pub f_offset: ::off_t,
229+
pub f_data: *mut ::c_void,
230+
pub f_flag: ::c_uint,
231+
}
232+
233+
pub struct kinfo_cputime {
234+
pub cp_user: u64,
235+
pub cp_nice: u64,
236+
pub cp_sys: u64,
237+
pub cp_intr: u64,
238+
pub cp_idel: u64,
239+
cp_unused01: u64,
240+
cp_unused02: u64,
241+
pub cp_sample_pc: u64,
242+
pub cp_sample_sp: u64,
243+
pub cp_msg: [::c_char; 32],
244+
}
218245
}
219246

220247
s_no_extra_traits! {

0 commit comments

Comments
 (0)