Date: Tue, 4 Apr 2023 15:22:41 +0200 From: Hans Petter Selasky <hps@selasky.org> To: Konstantin Belousov <kib@FreeBSD.org>, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: dac310248826 - main - Rename kqueue1(2) to kqueuex(2) to avoid compat issues with NetBSD Message-ID: <85946055-4dd5-c297-8d85-075c1eafdb09@selasky.org> In-Reply-To: <202304041319.334DJUQL084857@gitrepo.freebsd.org> References: <202304041319.334DJUQL084857@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 4/4/23 15:19, Konstantin Belousov wrote: > The branch main has been updated by kib: > > URL: https://cgit.FreeBSD.org/src/commit/?id=dac310248826c37b60306c1b25fb94c35802196d > > commit dac310248826c37b60306c1b25fb94c35802196d > Author: Konstantin Belousov <kib@FreeBSD.org> > AuthorDate: 2023-03-31 22:27:00 +0000 > Commit: Konstantin Belousov <kib@FreeBSD.org> > CommitDate: 2023-04-04 13:19:08 +0000 > > Rename kqueue1(2) to kqueuex(2) to avoid compat issues with NetBSD > > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > Differential revision: https://reviews.freebsd.org/D39377 > --- One minor nit. Should the kqueue1.2 be added to the delete-old list? --HPS > lib/libc/sys/Makefile.inc | 2 +- > lib/libc/sys/Symbol.map | 2 +- > lib/libc/sys/kqueue.2 | 6 +++--- > sys/kern/kern_event.c | 2 +- > sys/kern/syscalls.master | 2 +- > sys/sys/event.h | 4 ++-- > 6 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc > index 54143b288dc4..86b3d296f561 100644 > --- a/lib/libc/sys/Makefile.inc > +++ b/lib/libc/sys/Makefile.inc > @@ -430,7 +430,7 @@ MLINKS+=jail.2 jail_attach.2 \ > jail.2 jail_set.2 > MLINKS+=kldunload.2 kldunloadf.2 > MLINKS+=kqueue.2 kevent.2 \ > - kqueue.2 kqueue1.2 \ > + kqueue.2 kqueuex.2 \ > kqueue.2 EV_SET.3 > MLINKS+=link.2 linkat.2 > MLINKS+=madvise.2 posix_madvise.2 > diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map > index 7f6afd7b298b..cc90998e83fb 100644 > --- a/lib/libc/sys/Symbol.map > +++ b/lib/libc/sys/Symbol.map > @@ -419,7 +419,7 @@ FBSD_1.6 { > FBSD_1.7 { > _Fork; > fspacectl; > - kqueue1; > + kqueuex; > swapoff; > }; > > diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2 > index a2470696d4df..af60bb396d6a 100644 > --- a/lib/libc/sys/kqueue.2 > +++ b/lib/libc/sys/kqueue.2 > @@ -38,7 +38,7 @@ > .Ft int > .Fn kqueue "void" > .Ft int > -.Fn kqueue1 "u_int flags" > +.Fn kqueuex "u_int flags" > .Ft int > .Fo kevent > .Fa "int kq" > @@ -92,7 +92,7 @@ flag, then the descriptor table is shared, > which will allow sharing of the kqueue between two processes. > .Pp > The > -.Fn kqueue1 > +.Fn kqueuex > system call also creates a new kernel event queue, and additionally takes > the > .Fa flags > @@ -105,7 +105,7 @@ The returned file descriptor is automatically closed on > The > .Ql fd = kqueue() > call is equivalent to > -.Ql fd = kqueue1(0) . > +.Ql fd = kqueuex(0) . > .Pp > The > .Fn kevent > diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c > index 0da4325ccd6a..5cafa0c803fd 100644 > --- a/sys/kern/kern_event.c > +++ b/sys/kern/kern_event.c > @@ -1058,7 +1058,7 @@ sys_kqueue(struct thread *td, struct kqueue_args *uap) > } > > int > -sys_kqueue1(struct thread *td, struct kqueue1_args *uap) > +sys_kqueuex(struct thread *td, struct kqueuex_args *uap) > { > int flags; > > diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master > index 52ae6bda5a16..92de51fc0d97 100644 > --- a/sys/kern/syscalls.master > +++ b/sys/kern/syscalls.master > @@ -3307,7 +3307,7 @@ > ); > } > 583 AUE_KQUEUE STD|CAPENABLED { > - int kqueue1( > + int kqueuex( > u_int flags > ); > } > diff --git a/sys/sys/event.h b/sys/sys/event.h > index a2c0d481ebb2..b902f195723e 100644 > --- a/sys/sys/event.h > +++ b/sys/sys/event.h > @@ -218,7 +218,7 @@ struct freebsd11_kevent32 { > #define NOTE_NSECONDS 0x00000008 /* data is nanoseconds */ > #define NOTE_ABSTIME 0x00000010 /* timeout is absolute */ > > -/* Flags for kqueue1(2) */ > +/* Flags for kqueuex(2) */ > #define KQUEUE_CLOEXEC 0x00000001 /* close on exec */ > > struct knote; > @@ -361,7 +361,7 @@ struct timespec; > > __BEGIN_DECLS > int kqueue(void); > -int kqueue1(unsigned flags); > +int kqueuex(unsigned flags); > int kevent(int kq, const struct kevent *changelist, int nchanges, > struct kevent *eventlist, int nevents, > const struct timespec *timeout);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?85946055-4dd5-c297-8d85-075c1eafdb09>