Skip to content

Commit

Permalink
Revert addition of epoll to libc until discussion concludes
Browse files Browse the repository at this point in the history
  • Loading branch information
@alarixnia
alarixnia committed Aug 3, 2023
1 parent 2fd4746 commit e6ea867
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 43 deletions.
44 changes: 22 additions & 22 deletions distrib/sets/lists/comp/mi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.2441 2023/08/01 17:51:24 christos Exp $
# $NetBSD: mi,v 1.2442 2023/08/03 12:24:47 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
Expand Down Expand Up @@ -3432,7 +3432,7 @@
./usr/include/sys/elfdefinitions.h comp-c-include
./usr/include/sys/endian.h comp-c-include
./usr/include/sys/envsys.h comp-c-include
./usr/include/sys/epoll.h comp-c-include
./usr/include/sys/epoll.h comp-obsolete obsolete
./usr/include/sys/errno.h comp-c-include
./usr/include/sys/evcnt.h comp-c-include
./usr/include/sys/event.h comp-c-include
Expand Down Expand Up @@ -13318,16 +13318,16 @@
./usr/share/man/html2/dup.html comp-c-htmlman html
./usr/share/man/html2/dup2.html comp-c-htmlman html
./usr/share/man/html2/dup3.html comp-c-htmlman html
./usr/share/man/html2/epoll.html comp-c-htmlman html
./usr/share/man/html2/epoll_create.html comp-c-htmlman html
./usr/share/man/html2/epoll_create1.html comp-c-htmlman html
./usr/share/man/html2/epoll_ctl.html comp-c-htmlman html
./usr/share/man/html2/epoll_data.html comp-c-htmlman html
./usr/share/man/html2/epoll_data_t.html comp-c-htmlman html
./usr/share/man/html2/epoll_event.html comp-c-htmlman html
./usr/share/man/html2/epoll_pwait.html comp-c-htmlman html
./usr/share/man/html2/epoll_pwait2.html comp-c-htmlman html
./usr/share/man/html2/epoll_wait.html comp-c-htmlman html
./usr/share/man/html2/epoll.html comp-obsolete obsolete
./usr/share/man/html2/epoll_create.html comp-obsolete obsolete
./usr/share/man/html2/epoll_create1.html comp-obsolete obsolete
./usr/share/man/html2/epoll_ctl.html comp-obsolete obsolete
./usr/share/man/html2/epoll_data.html comp-obsolete obsolete
./usr/share/man/html2/epoll_data_t.html comp-obsolete obsolete
./usr/share/man/html2/epoll_event.html comp-obsolete obsolete
./usr/share/man/html2/epoll_pwait.html comp-obsolete obsolete
./usr/share/man/html2/epoll_pwait2.html comp-obsolete obsolete
./usr/share/man/html2/epoll_wait.html comp-obsolete obsolete
./usr/share/man/html2/errno.html comp-c-htmlman html
./usr/share/man/html2/eventfd.html comp-c-htmlman html
./usr/share/man/html2/eventfd_read.html comp-c-htmlman html
Expand Down Expand Up @@ -21643,16 +21643,16 @@
./usr/share/man/man2/dup.2 comp-c-man .man
./usr/share/man/man2/dup2.2 comp-c-man .man
./usr/share/man/man2/dup3.2 comp-c-man .man
./usr/share/man/man2/epoll.2 comp-c-man .man
./usr/share/man/man2/epoll_create.2 comp-c-man .man
./usr/share/man/man2/epoll_create1.2 comp-c-man .man
./usr/share/man/man2/epoll_ctl.2 comp-c-man .man
./usr/share/man/man2/epoll_data.2 comp-c-man .man
./usr/share/man/man2/epoll_data_t.2 comp-c-man .man
./usr/share/man/man2/epoll_event.2 comp-c-man .man
./usr/share/man/man2/epoll_pwait.2 comp-c-man .man
./usr/share/man/man2/epoll_pwait2.2 comp-c-man .man
./usr/share/man/man2/epoll_wait.2 comp-c-man .man
./usr/share/man/man2/epoll.2 comp-obsolete obsolete
./usr/share/man/man2/epoll_create.2 comp-obsolete obsolete
./usr/share/man/man2/epoll_create1.2 comp-obsolete obsolete
./usr/share/man/man2/epoll_ctl.2 comp-obsolete obsolete
./usr/share/man/man2/epoll_data.2 comp-obsolete obsolete
./usr/share/man/man2/epoll_data_t.2 comp-obsolete obsolete
./usr/share/man/man2/epoll_event.2 comp-obsolete obsolete
./usr/share/man/man2/epoll_pwait.2 comp-obsolete obsolete
./usr/share/man/man2/epoll_pwait2.2 comp-obsolete obsolete
./usr/share/man/man2/epoll_wait.2 comp-obsolete obsolete
./usr/share/man/man2/errno.2 comp-c-man .man
./usr/share/man/man2/eventfd.2 comp-c-man .man
./usr/share/man/man2/eventfd_read.2 comp-c-man .man
Expand Down
3 changes: 1 addition & 2 deletions distrib/sets/lists/debug/mi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.410 2023/08/01 06:35:55 mrg Exp $
# $NetBSD: mi,v 1.411 2023/08/03 12:24:47 nia Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
Expand Down Expand Up @@ -1790,7 +1790,6 @@
./usr/libdata/debug/usr/tests/kernel/posix_spawn/t_fileactions.debug tests-obsolete obsolete,compattestfile
./usr/libdata/debug/usr/tests/kernel/posix_spawn/t_spawn.debug tests-obsolete obsolete,compattestfile
./usr/libdata/debug/usr/tests/kernel/posix_spawn/t_spawnattr.debug tests-obsolete obsolete,compattestfile
./usr/libdata/debug/usr/tests/kernel/t_epoll.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/t_extattrctl.debug tests-kernel-tests debug,atf,rump
./usr/libdata/debug/usr/tests/kernel/t_extent.debug tests-kernel-tests debug,atf,compattestfile
./usr/libdata/debug/usr/tests/kernel/t_fcntl.debug tests-kernel-tests debug,atf
Expand Down
4 changes: 2 additions & 2 deletions distrib/sets/lists/tests/mi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.1281 2023/08/01 06:35:56 mrg Exp $
# $NetBSD: mi,v 1.1282 2023/08/03 12:24:47 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
Expand Down Expand Up @@ -2296,7 +2296,7 @@
./usr/tests/kernel/posix_spawn/t_fileactions tests-obsolete obsolete
./usr/tests/kernel/posix_spawn/t_spawn tests-obsolete obsolete
./usr/tests/kernel/posix_spawn/t_spawnattr tests-obsolete obsolete
./usr/tests/kernel/t_epoll tests-kernel-tests atf
./usr/tests/kernel/t_epoll tests-obsolete obsolete
./usr/tests/kernel/t_extattrctl tests-kernel-tests atf,rump
./usr/tests/kernel/t_extent tests-kernel-tests compattestfile,atf
./usr/tests/kernel/t_fcntl tests-kernel-tests atf
Expand Down
16 changes: 3 additions & 13 deletions lib/libc/sys/Makefile.inc
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.252 2023/07/28 18:19:00 christos Exp $
# $NetBSD: Makefile.inc,v 1.253 2023/08/03 12:24:46 nia Exp $
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94

# sys sources
Expand All @@ -7,7 +7,7 @@
# other sources shared with the kernel, used in syscalls
SRCS+= cpuset.c
# glue to offer userland wrappers for some syscalls
SRCS+= accept4.c clock_getcpuclockid.c epoll.c eventfd_read.c \
SRCS+= accept4.c clock_getcpuclockid.c eventfd_read.c \
eventfd_write.c posix_fadvise.c posix_madvise.c ppoll.c sched.c \
sigqueue.c sigtimedwait.c sigwait.c sigwaitinfo.c statvfs.c swapon.c \
semctl.c vadvise.c
Expand Down Expand Up @@ -103,7 +103,6 @@ ASM=\
clock_getcpuclockid2.S \
__clock_getres50.S __clock_gettime50.S \
dup.S dup2.S dup3.S \
epoll_create1.S epoll_ctl.S epoll_pwait2.S \
eventfd.S \
extattrctl.S \
extattr_delete_fd.S extattr_delete_file.S \
Expand Down Expand Up @@ -261,7 +260,7 @@ LintSysPseudoNoerr.c: ${LIBCDIR}/sys/makelintstub \
MAN+= accept.2 access.2 acct.2 adjtime.2 bind.2 brk.2 chdir.2 \
chflags.2 chmod.2 chown.2 chroot.2 clock_getcpuclockid2.2 \
clock_settime.2 clone.2 close.2 \
connect.2 dup.2 epoll.2 eventfd.2 execve.2 _exit.2 extattr_get_file.2 \
connect.2 dup.2 eventfd.2 execve.2 _exit.2 extattr_get_file.2 \
fcntl.2 fdatasync.2 fdiscard.2 fhopen.2 \
flock.2 fork.2 fsync.2 getcontext.2 getdents.2 \
getfh.2 getvfsstat.2 getgid.2 getgroups.2 \
Expand Down Expand Up @@ -309,15 +308,6 @@ MLINKS+=chown.2 fchown.2 chown.2 lchown.2
MLINKS+=chroot.2 fchroot.2
MLINKS+=clock_settime.2 clock_gettime.2
MLINKS+=clock_settime.2 clock_getres.2
MLINKS+=epoll.2 epoll_event.2 \
epoll.2 epoll_data.2 \
epoll.2 epoll_data_t.2 \
epoll.2 epoll_create.2 \
epoll.2 epoll_create1.2 \
epoll.2 epoll_ctl.2 \
epoll.2 epoll_wait.2 \
epoll.2 epoll_pwait.2 \
epoll.2 epoll_pwait2.2
MLINKS+=eventfd.2 eventfd_read.2 \
eventfd.2 eventfd_write.2
MLINKS+=extattr_get_file.2 extattr_set_file.2 \
Expand Down
4 changes: 2 additions & 2 deletions sys/sys/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.181 2023/07/28 18:19:01 christos Exp $
# $NetBSD: Makefile,v 1.182 2023/08/03 12:24:46 nia Exp $

.include <bsd.own.mk>

Expand All @@ -18,7 +18,7 @@ INCS= acct.h acl.h agpio.h aio.h ansi.h aout_mids.h ataio.h atomic.h \
dir.h dirent.h \
disk.h disklabel.h disklabel_acorn.h disklabel_gpt.h disklabel_rdb.h \
dkbad.h dkio.h dkstat.h domain.h drvctlio.h dvdio.h \
efiio.h endian.h envsys.h epoll.h errno.h evcnt.h event.h eventfd.h exec.h \
efiio.h endian.h envsys.h errno.h evcnt.h event.h eventfd.h exec.h \
exec_aout.h exec_coff.h exec_ecoff.h exec_elf.h exec_script.h \
extattr.h extent.h \
fault.h \
Expand Down
4 changes: 2 additions & 2 deletions tests/kernel/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.74 2023/07/29 12:16:34 christos Exp $
# $NetBSD: Makefile,v 1.75 2023/08/03 12:24:46 nia Exp $

NOMAN= # defined

Expand All @@ -7,7 +7,7 @@ NOMAN= # defined
TESTSDIR= ${TESTSBASE}/kernel

TESTS_SUBDIRS+= kqueue
TESTS_C= t_epoll
#TESTS_C= t_epoll
TESTS_C+= t_fcntl
TESTS_C+= t_lock
TESTS_C+= t_lockf
Expand Down

0 comments on commit e6ea867

Please sign in to comment.