d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename kqueue1(2) to kqueuex(2) to avoid compat issues with NetBSD

Browse Source 
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D39377
This commit is contained in:
Konstantin Belousov 2023-04-01 01:27:00 +03:00
parent 73ee5756de
commit dac3102488
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libc/sys/Makefile.inc
View File

@ -430,7 +430,7 @@ MLINKS+=jail.2 jail_attach.2 \
jail.2 jail_set.2 jail.2 jail_set.2
MLINKS+=kldunload.2 kldunloadf.2 MLINKS+=kldunload.2 kldunloadf.2
MLINKS+=kqueue.2 kevent.2 \ MLINKS+=kqueue.2 kevent.2 \
kqueue.2 kqueue1.2 \ kqueue.2 kqueuex.2 \
kqueue.2 EV_SET.3 kqueue.2 EV_SET.3
MLINKS+=link.2 linkat.2 MLINKS+=link.2 linkat.2
MLINKS+=madvise.2 posix_madvise.2 MLINKS+=madvise.2 posix_madvise.2

2
lib/libc/sys/Symbol.map
View File

@ -419,7 +419,7 @@ FBSD_1.6 {
FBSD_1.7 { FBSD_1.7 {
_Fork; _Fork;
fspacectl; fspacectl;
kqueue1; kqueuex;
swapoff; swapoff;
}; };

6
lib/libc/sys/kqueue.2
View File

@ -38,7 +38,7 @@
.Ft int .Ft int
.Fn kqueue "void" .Fn kqueue "void"
.Ft int .Ft int
.Fn kqueue1 "u_int flags" .Fn kqueuex "u_int flags"
.Ft int .Ft int
.Fo kevent .Fo kevent
.Fa "int kq" .Fa "int kq"
@ -92,7 +92,7 @@ flag, then the descriptor table is shared,
which will allow sharing of the kqueue between two processes. which will allow sharing of the kqueue between two processes.
.Pp .Pp
The The
.Fn kqueue1 .Fn kqueuex
system call also creates a new kernel event queue, and additionally takes system call also creates a new kernel event queue, and additionally takes
the the
.Fa flags .Fa flags
@ -105,7 +105,7 @@ The returned file descriptor is automatically closed on
The The
.Ql fd = kqueue() .Ql fd = kqueue()
call is equivalent to call is equivalent to
.Ql fd = kqueue1(0) . .Ql fd = kqueuex(0) .
.Pp .Pp
The The
.Fn kevent .Fn kevent

2
sys/kern/kern_event.c
View File

@ -1058,7 +1058,7 @@ sys_kqueue(struct thread *td, struct kqueue_args *uap)
} }
int int
sys_kqueue1(struct thread *td, struct kqueue1_args *uap) sys_kqueuex(struct thread *td, struct kqueuex_args *uap)
{ {
int flags; int flags;

2
sys/kern/syscalls.master
View File

@ -3307,7 +3307,7 @@
); );
} }
583 AUE_KQUEUE STD|CAPENABLED { 583 AUE_KQUEUE STD|CAPENABLED {
int kqueue1( int kqueuex(
u_int flags u_int flags
); );
} }

4
sys/sys/event.h
View File

@ -218,7 +218,7 @@ struct freebsd11_kevent32 {
#define NOTE_NSECONDS 0x00000008 /* data is nanoseconds */ #define NOTE_NSECONDS 0x00000008 /* data is nanoseconds */
#define NOTE_ABSTIME 0x00000010 /* timeout is absolute */ #define NOTE_ABSTIME 0x00000010 /* timeout is absolute */
/* Flags for kqueue1(2) */ /* Flags for kqueuex(2) */
#define KQUEUE_CLOEXEC 0x00000001 /* close on exec */ #define KQUEUE_CLOEXEC 0x00000001 /* close on exec */
struct knote; struct knote;
@ -361,7 +361,7 @@ struct timespec;
__BEGIN_DECLS __BEGIN_DECLS
int kqueue(void); int kqueue(void);
int kqueue1(unsigned flags); int kqueuex(unsigned flags);
int kevent(int kq, const struct kevent *changelist, int nchanges, int kevent(int kq, const struct kevent *changelist, int nchanges,
struct kevent *eventlist, int nevents, struct kevent *eventlist, int nevents,
const struct timespec *timeout); const struct timespec *timeout);