Skip to content

Commit b3853e8

Browse files
valpackettvalpackett
committed
Add missing kqueue constants across BSDs
While here, reorder some to match the C headers
1 parent 68e06ad commit b3853e8

File tree

9 files changed

+52
-5
lines changed

9 files changed

+52
-5
lines changed

‎libc-test/build.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2283,6 +2283,9 @@ fn test_freebsd(target: &str) {
22832283
// FIXME: Removed in https://reviews.freebsd.org/D39127.
22842284
"KERN_VNODE" => true,
22852285

2286+
// Added in FreeBSD 14
2287+
"EV_KEEPUDATA" if Some(14) > freebsd_ver => true,
2288+
22862289
_ => false,
22872290
}
22882291
});

‎libc-test/semver/dragonfly.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ EV_ENABLE
269269
EV_EOF
270270
EV_ERROR
271271
EV_FLAG1
272+
EV_HUP
272273
EV_NODATA
273274
EV_ONESHOT
274275
EV_RECEIPT

‎libc-test/semver/freebsd.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,9 @@ EV_ENABLE
307307
EV_EOF
308308
EV_ERROR
309309
EV_FLAG1
310+
EV_FLAG2
311+
EV_FORCEONESHOT
312+
EV_KEEPUDATA
310313
EV_ONESHOT
311314
EV_RECEIPT
312315
EV_SYSFLAGS
@@ -791,8 +794,11 @@ NI_NUMERICSERV
791794
NOEXPR
792795
NOKERNINFO
793796
NOSTR
797+
NOTE_ABSTIME
794798
NOTE_ATTRIB
795799
NOTE_CHILD
800+
NOTE_CLOSE
801+
NOTE_CLOSE_WRITE
796802
NOTE_DELETE
797803
NOTE_EXEC
798804
NOTE_EXIT
@@ -803,13 +809,16 @@ NOTE_FFCTRLMASK
803809
NOTE_FFLAGSMASK
804810
NOTE_FFNOP
805811
NOTE_FFOR
812+
NOTE_FILE_POLL
806813
NOTE_FORK
807814
NOTE_LINK
808815
NOTE_LOWAT
809816
NOTE_MSECONDS
810817
NOTE_NSECONDS
818+
NOTE_OPEN
811819
NOTE_PCTRLMASK
812820
NOTE_PDATAMASK
821+
NOTE_READ
813822
NOTE_RENAME
814823
NOTE_REVOKE
815824
NOTE_SECONDS

‎libc-test/semver/netbsd.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,12 @@ NOTE_DELETE
730730
NOTE_EXEC
731731
NOTE_EXIT
732732
NOTE_EXTEND
733+
NOTE_FFAND
734+
NOTE_FFCOPY
735+
NOTE_FFCTRLMASK
736+
NOTE_FFLAGSMASK
737+
NOTE_FFNOP
738+
NOTE_FFOR
733739
NOTE_FORK
734740
NOTE_LINK
735741
NOTE_LOWAT
@@ -741,6 +747,7 @@ NOTE_RENAME
741747
NOTE_REVOKE
742748
NOTE_TRACK
743749
NOTE_TRACKERR
750+
NOTE_TRIGGER
744751
NOTE_USECONDS
745752
NOTE_WRITE
746753
NTP_API

‎libc-test/semver/openbsd.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,8 @@ ESOCKTNOSUPPORT
176176
ETOOMANYREFS
177177
EUSERS
178178
EVFILT_AIO
179+
EVFILT_DEVICE
180+
EVFILT_EXCEPT
179181
EVFILT_PROC
180182
EVFILT_READ
181183
EVFILT_SIGNAL
@@ -582,6 +584,7 @@ NOEXPR
582584
NOKERNINFO
583585
NOSTR
584586
NOTE_ATTRIB
587+
NOTE_CHANGE
585588
NOTE_CHILD
586589
NOTE_DELETE
587590
NOTE_EOF
@@ -591,6 +594,7 @@ NOTE_EXTEND
591594
NOTE_FORK
592595
NOTE_LINK
593596
NOTE_LOWAT
597+
NOTE_OOB
594598
NOTE_PCTRLMASK
595599
NOTE_PDATAMASK
596600
NOTE_RENAME

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,6 +1091,7 @@ pub const EV_NODATA: u16 = 0x1000;
10911091
pub const EV_FLAG1: u16 = 0x2000;
10921092
pub const EV_ERROR: u16 = 0x4000;
10931093
pub const EV_EOF: u16 = 0x8000;
1094+
pub const EV_HUP: u16 = 0x8000;
10941095
pub const EV_SYSFLAGS: u16 = 0xf000;
10951096

10961097
pub const FIODNAME: ::c_ulong = 0x80106678;

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2693,15 +2693,20 @@ pub const EV_ADD: u16 = 0x1;
26932693
pub const EV_DELETE: u16 = 0x2;
26942694
pub const EV_ENABLE: u16 = 0x4;
26952695
pub const EV_DISABLE: u16 = 0x8;
2696+
pub const EV_FORCEONESHOT: u16 = 0x100;
2697+
pub const EV_KEEPUDATA: u16 = 0x200;
2698+
26962699
pub const EV_ONESHOT: u16 = 0x10;
26972700
pub const EV_CLEAR: u16 = 0x20;
26982701
pub const EV_RECEIPT: u16 = 0x40;
26992702
pub const EV_DISPATCH: u16 = 0x80;
2703+
pub const EV_SYSFLAGS: u16 = 0xf000;
27002704
pub const EV_DROP: u16 = 0x1000;
27012705
pub const EV_FLAG1: u16 = 0x2000;
2702-
pub const EV_ERROR: u16 = 0x4000;
2706+
pub const EV_FLAG2: u16 = 0x4000;
2707+
27032708
pub const EV_EOF: u16 = 0x8000;
2704-
pub const EV_SYSFLAGS: u16 = 0xf000;
2709+
pub const EV_ERROR: u16 = 0x4000;
27052710

27062711
pub const NOTE_TRIGGER: u32 = 0x01000000;
27072712
pub const NOTE_FFNOP: u32 = 0x00000000;
@@ -2711,13 +2716,18 @@ pub const NOTE_FFCOPY: u32 = 0xc0000000;
27112716
pub const NOTE_FFCTRLMASK: u32 = 0xc0000000;
27122717
pub const NOTE_FFLAGSMASK: u32 = 0x00ffffff;
27132718
pub const NOTE_LOWAT: u32 = 0x00000001;
2719+
pub const NOTE_FILE_POLL: u32 = 0x00000002;
27142720
pub const NOTE_DELETE: u32 = 0x00000001;
27152721
pub const NOTE_WRITE: u32 = 0x00000002;
27162722
pub const NOTE_EXTEND: u32 = 0x00000004;
27172723
pub const NOTE_ATTRIB: u32 = 0x00000008;
27182724
pub const NOTE_LINK: u32 = 0x00000010;
27192725
pub const NOTE_RENAME: u32 = 0x00000020;
27202726
pub const NOTE_REVOKE: u32 = 0x00000040;
2727+
pub const NOTE_OPEN: u32 = 0x00000080;
2728+
pub const NOTE_CLOSE: u32 = 0x00000100;
2729+
pub const NOTE_CLOSE_WRITE: u32 = 0x00000200;
2730+
pub const NOTE_READ: u32 = 0x00000400;
27212731
pub const NOTE_EXIT: u32 = 0x80000000;
27222732
pub const NOTE_FORK: u32 = 0x40000000;
27232733
pub const NOTE_EXEC: u32 = 0x20000000;
@@ -2730,6 +2740,7 @@ pub const NOTE_SECONDS: u32 = 0x00000001;
27302740
pub const NOTE_MSECONDS: u32 = 0x00000002;
27312741
pub const NOTE_USECONDS: u32 = 0x00000004;
27322742
pub const NOTE_NSECONDS: u32 = 0x00000008;
2743+
pub const NOTE_ABSTIME: u32 = 0x00000010;
27332744

27342745
pub const MADV_PROTECT: ::c_int = 10;
27352746

‎src/unix/bsd/netbsdlike/netbsd/mod.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1986,6 +1986,13 @@ pub const EV_ERROR: u32 = 0x4000;
19861986
pub const EV_EOF: u32 = 0x8000;
19871987
pub const EV_SYSFLAGS: u32 = 0xf000;
19881988

1989+
pub const NOTE_TRIGGER: u32 = 0x01000000;
1990+
pub const NOTE_FFNOP: u32 = 0x00000000;
1991+
pub const NOTE_FFAND: u32 = 0x40000000;
1992+
pub const NOTE_FFOR: u32 = 0x80000000;
1993+
pub const NOTE_FFCOPY: u32 = 0xc0000000;
1994+
pub const NOTE_FFCTRLMASK: u32 = 0xc0000000;
1995+
pub const NOTE_FFLAGSMASK: u32 = 0x00ffffff;
19891996
pub const NOTE_LOWAT: u32 = 0x00000001;
19901997
pub const NOTE_DELETE: u32 = 0x00000001;
19911998
pub const NOTE_WRITE: u32 = 0x00000002;

‎src/unix/bsd/netbsdlike/openbsd/mod.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,13 +1279,15 @@ pub const PTHREAD_MUTEX_NORMAL: ::c_int = 3;
12791279
pub const PTHREAD_MUTEX_STRICT_NP: ::c_int = 4;
12801280
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_STRICT_NP;
12811281

1282+
pub const EVFILT_READ: i16 = -1;
1283+
pub const EVFILT_WRITE: i16 = -2;
12821284
pub const EVFILT_AIO: i16 = -3;
1285+
pub const EVFILT_VNODE: i16 = -4;
12831286
pub const EVFILT_PROC: i16 = -5;
1284-
pub const EVFILT_READ: i16 = -1;
12851287
pub const EVFILT_SIGNAL: i16 = -6;
12861288
pub const EVFILT_TIMER: i16 = -7;
1287-
pub const EVFILT_VNODE: i16 = -4;
1288-
pub const EVFILT_WRITE: i16 = -2;
1289+
pub const EVFILT_DEVICE: i16 = -8;
1290+
pub const EVFILT_EXCEPT: i16 = -9;
12891291

12901292
pub const EV_ADD: u16 = 0x1;
12911293
pub const EV_DELETE: u16 = 0x2;
@@ -1304,6 +1306,7 @@ pub const EV_SYSFLAGS: u16 = 0xf800;
13041306

13051307
pub const NOTE_LOWAT: u32 = 0x00000001;
13061308
pub const NOTE_EOF: u32 = 0x00000002;
1309+
pub const NOTE_OOB: u32 = 0x00000004;
13071310
pub const NOTE_DELETE: u32 = 0x00000001;
13081311
pub const NOTE_WRITE: u32 = 0x00000002;
13091312
pub const NOTE_EXTEND: u32 = 0x00000004;
@@ -1320,6 +1323,7 @@ pub const NOTE_PCTRLMASK: u32 = 0xf0000000;
13201323
pub const NOTE_TRACK: u32 = 0x00000001;
13211324
pub const NOTE_TRACKERR: u32 = 0x00000002;
13221325
pub const NOTE_CHILD: u32 = 0x00000004;
1326+
pub const NOTE_CHANGE: u32 = 0x00000001;
13231327

13241328
pub const TMP_MAX: ::c_uint = 0x7fffffff;
13251329

0 commit comments

Comments
 (0)