Reduce the size of the interposing table and amount of

cancellation-handling code in the libthr.  Translate some syscalls
into their more generic counterpart, and remove translated syscalls
from the table.

List of the affected syscalls:
creat, open -> openat
raise -> thr_kill
sleep, usleep -> nanosleep
pause -> sigsuspend
wait, wait3, waitpid -> wait4

Suggested and reviewed by:	jilles (previous version)
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week

13 files changed, 49 insertions, 142 deletions

diff --git a/lib/libc/compat-43/Symbol.map b/lib/libc/compat-43/Symbol.map
index 2827705..bd49f99 100644
--- a/lib/libc/compat-43/Symbol.map
+++ b/lib/libc/compat-43/Symbol.map
@@ -28,5 +28,4 @@ FBSD_1.2 {
 FBSDprivate_1.0 {
 	__creat;
 	_creat;
-	__libc_creat;
 };
diff --git a/lib/libc/compat-43/creat.c b/lib/libc/compat-43/creat.c
index 5ee4531..4545482 100644
--- a/lib/libc/compat-43/creat.c
+++ b/lib/libc/compat-43/creat.c
@@ -38,21 +38,16 @@ __FBSDID("$FreeBSD$");
 #include "un-namespace.h"
 #include "libc_private.h"
 
-__weak_reference(__libc_creat, __creat);
-__weak_reference(__libc_creat, _creat);
+__weak_reference(__creat, creat);
+__weak_reference(__creat, _creat);
 
 #pragma weak creat
 int
-creat(const char *path, mode_t mode)
+__creat(const char *path, mode_t mode)
 {
 
-	return (((int (*)(const char *, mode_t))
-	    __libc_interposing[INTERPOS_creat])(path, mode));
+	return (((int (*)(int, const char *, int, ...))
+	    __libc_interposing[INTERPOS_openat])(AT_FDCWD, path, O_WRONLY |
+	    O_CREAT | O_TRUNC, mode));
 }
 
-int
-__libc_creat(const char *path, mode_t mode)
-{
-
-	return(__sys_open(path, O_WRONLY | O_CREAT | O_TRUNC, mode));
-}
diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map
index e01a897..ee4d619 100644
--- a/lib/libc/gen/Symbol.map
+++ b/lib/libc/gen/Symbol.map
@@ -533,14 +533,7 @@ FBSDprivate_1.0 {
 	_libc_sem_post_compat;
 	_libc_sem_getvalue_compat;
 
-	__libc_pause;
-	__libc_raise;
-	__libc_sleep;
 	__libc_tcdrain;
-	__libc_usleep;
-	__libc_wait;
-	__libc_wait3;
-	__libc_waitpid;
 
 	__elf_aux_vector;
 	__pthread_map_stacks_exec;
diff --git a/lib/libc/gen/pause.c b/lib/libc/gen/pause.c
index 97fbb01..ef48c1c 100644
--- a/lib/libc/gen/pause.c
+++ b/lib/libc/gen/pause.c
@@ -33,10 +33,8 @@ static char sccsid[] = "@(#)pause.c	8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "namespace.h"
 #include <signal.h>
 #include <unistd.h>
-#include "un-namespace.h"
 
 #include "libc_private.h"
 
@@ -44,23 +42,14 @@ __FBSDID("$FreeBSD$");
  * Backwards compatible pause.
  */
 int
-__libc_pause(void)
+__pause(void)
 {
 	sigset_t oset;
 
-	if (_sigprocmask(SIG_BLOCK, NULL, &oset) == -1)
+	if (sigprocmask(SIG_BLOCK, NULL, &oset) == -1)
 		return (-1);
-	return (_sigsuspend(&oset));
+	return (sigsuspend(&oset));
 }
 
-#pragma weak pause
-int
-pause(void)
-{
-
-	return (((int (*)(void))
-	    __libc_interposing[INTERPOS_pause])());
-}
-
-__weak_reference(__libc_pause, __pause);
-__weak_reference(__libc_pause, _pause);
+__weak_reference(__pause, pause);
+__weak_reference(__pause, _pause);
diff --git a/lib/libc/gen/raise.c b/lib/libc/gen/raise.c
index d605639..994fea5 100644
--- a/lib/libc/gen/raise.c
+++ b/lib/libc/gen/raise.c
@@ -38,21 +38,15 @@ __FBSDID("$FreeBSD$");
 
 #include "libc_private.h"
 
-__weak_reference(__libc_raise, __raise);
-__weak_reference(__libc_raise, _raise);
+__weak_reference(__raise, raise);
+__weak_reference(__raise, _raise);
 
-#pragma weak raise
 int
-raise(int s)
+__raise(int s)
 {
+	long id;
 
-	return (((int (*)(int))
-	    __libc_interposing[INTERPOS_raise])(s));
-}
-
-int
-__libc_raise(int s)
-{
-
-	return (kill(getpid(), s));
+	if (__sys_thr_self(&id) == -1)
+		return (-1);
+	return (__sys_thr_kill(id, s));
 }
diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c
index f558e36..6bb4ecd 100644
--- a/lib/libc/gen/sleep.c
+++ b/lib/libc/gen/sleep.c
@@ -42,17 +42,8 @@ __FBSDID("$FreeBSD$");
 
 #include "libc_private.h"
 
-#pragma weak sleep
 unsigned int
-sleep(unsigned int seconds)
-{
-
-	return (((unsigned int (*)(unsigned int))
-	    __libc_interposing[INTERPOS_sleep])(seconds));
-}
-
-unsigned int
-__libc_sleep(unsigned int seconds)
+__sleep(unsigned int seconds)
 {
 	struct timespec time_to_sleep;
 	struct timespec time_remaining;
@@ -62,17 +53,19 @@ __libc_sleep(unsigned int seconds)
 	 * the maximum value for a time_t is >= INT_MAX.
 	 */
 	if (seconds > INT_MAX)
-		return (seconds - INT_MAX + __libc_sleep(INT_MAX));
+		return (seconds - INT_MAX + __sleep(INT_MAX));
 
 	time_to_sleep.tv_sec = seconds;
 	time_to_sleep.tv_nsec = 0;
-	if (_nanosleep(&time_to_sleep, &time_remaining) != -1)
+	if (((int (*)(const struct timespec *, struct timespec *))
+	    __libc_interposing[INTERPOS_nanosleep])(
+	    &time_to_sleep, &time_remaining) != -1)
 		return (0);
 	if (errno != EINTR)
 		return (seconds);		/* best guess */
 	return (time_remaining.tv_sec +
-		(time_remaining.tv_nsec != 0)); /* round up */
+	    (time_remaining.tv_nsec != 0)); /* round up */
 }
 
-__weak_reference(__libc_sleep, __sleep);
-__weak_reference(__libc_sleep, _sleep);
+__weak_reference(__sleep, sleep);
+__weak_reference(__sleep, _sleep);
diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c
index 1d58b98..7c35f6c 100644
--- a/lib/libc/gen/usleep.c
+++ b/lib/libc/gen/usleep.c
@@ -40,24 +40,16 @@ __FBSDID("$FreeBSD$");
 
 #include "libc_private.h"
 
-#pragma weak usleep
 int
-usleep(useconds_t useconds)
-{
-
-	return (((int (*)(useconds_t))
-	    __libc_interposing[INTERPOS_usleep])(useconds));
-}
-
-int
-__libc_usleep(useconds_t useconds)
+__usleep(useconds_t useconds)
 {
 	struct timespec time_to_sleep;
 
 	time_to_sleep.tv_nsec = (useconds % 1000000) * 1000;
 	time_to_sleep.tv_sec = useconds / 1000000;
-	return (_nanosleep(&time_to_sleep, NULL));
+	return (((int (*)(const struct timespec *, struct timespec *))
+	    __libc_interposing[INTERPOS_nanosleep])(&time_to_sleep, NULL));
 }
 
-__weak_reference(__libc_usleep, __usleep);
-__weak_reference(__libc_usleep, _usleep);
+__weak_reference(__usleep, usleep);
+__weak_reference(__usleep, _usleep);
diff --git a/lib/libc/gen/wait.c b/lib/libc/gen/wait.c
index dc1351d..46a3fdd 100644
--- a/lib/libc/gen/wait.c
+++ b/lib/libc/gen/wait.c
@@ -42,21 +42,13 @@ __FBSDID("$FreeBSD$");
 
 #include "libc_private.h"
 
-#pragma weak wait
 pid_t
-wait(int *istat)
+__wait(int *istat)
 {
 
-	return (((pid_t (*)(int *))
-	    __libc_interposing[INTERPOS_wait])(istat));
+	return (((pid_t (*)(pid_t, int *, int, struct rusage *))
+	    __libc_interposing[INTERPOS_wait4])(WAIT_ANY, istat, 0, NULL));
 }
 
-pid_t
-__libc_wait(int *istat)
-{
-
-	return (__sys_wait4(WAIT_ANY, istat, 0, NULL));
-}
-
-__weak_reference(__libc_wait, __wait);
-__weak_reference(__libc_wait, _wait);
+__weak_reference(__wait, wait);
+__weak_reference(__wait, _wait);
diff --git a/lib/libc/gen/wait3.c b/lib/libc/gen/wait3.c
index 2e116be..965effe 100644
--- a/lib/libc/gen/wait3.c
+++ b/lib/libc/gen/wait3.c
@@ -42,20 +42,12 @@ __FBSDID("$FreeBSD$");
 
 #include "libc_private.h"
 
-#pragma weak wait3
 pid_t
-wait3(int *istat, int options, struct rusage *rup)
+__wait3(int *istat, int options, struct rusage *rup)
 {
 
-	return (((pid_t (*)(int *, int, struct rusage *))
-	    __libc_interposing[INTERPOS_wait3])(istat, options, rup));
+	return (((pid_t (*)(pid_t, int *, int, struct rusage *))
+	    __libc_interposing[INTERPOS_wait4])(WAIT_ANY, istat, options, rup));
 }
 
-__weak_reference(__libc_wait3, __wait3);
-
-pid_t
-__libc_wait3(int *istat, int options, struct rusage *rup)
-{
-
-	return (__sys_wait4(WAIT_ANY, istat, options, rup));
-}
+__weak_reference(__wait3, wait3);
diff --git a/lib/libc/gen/waitpid.c b/lib/libc/gen/waitpid.c
index 27e920f..5177591 100644
--- a/lib/libc/gen/waitpid.c
+++ b/lib/libc/gen/waitpid.c
@@ -42,21 +42,13 @@ __FBSDID("$FreeBSD$");
 
 #include "libc_private.h"
 
-#pragma weak waitpid
 pid_t
-waitpid(pid_t pid, int *istat, int options)
+__waitpid(pid_t pid, int *istat, int options)
 {
 
-	return (((pid_t (*)(pid_t, int *, int))
-	    __libc_interposing[INTERPOS_waitpid])(pid, istat, options));
+	return (((pid_t (*)(pid_t, int *, int, struct rusage *))
+	    __libc_interposing[INTERPOS_wait4])(pid, istat, options, NULL));
 }
 
-pid_t
-__libc_waitpid(pid_t pid, int *istat, int options)
-{
-
-	return (__sys_wait4(pid, istat, options, NULL));
-}
-
-__weak_reference(__libc_waitpid, __waitpid);
-__weak_reference(__libc_waitpid, _waitpid);
+__weak_reference(__waitpid, waitpid);
+__weak_reference(__waitpid, _waitpid);
diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h
index ea1a97b..347b463 100644
--- a/lib/libc/include/libc_private.h
+++ b/lib/libc/include/libc_private.h
@@ -187,17 +187,14 @@ enum {
 	INTERPOS_aio_suspend,
 	INTERPOS_close,
 	INTERPOS_connect,
-	INTERPOS_creat,
 	INTERPOS_fcntl,
 	INTERPOS_fsync,
 	INTERPOS_fork,
 	INTERPOS_msync,
 	INTERPOS_nanosleep,
-	INTERPOS_open,
 	INTERPOS_openat,
 	INTERPOS_poll,
 	INTERPOS_pselect,
-	INTERPOS_raise,
 	INTERPOS_recvfrom,
 	INTERPOS_recvmsg,
 	INTERPOS_select,
@@ -212,16 +209,10 @@ enum {
 	INTERPOS_sigwaitinfo,
 	INTERPOS_swapcontext,
 	INTERPOS_system,
-	INTERPOS_sleep,
 	INTERPOS_tcdrain,
-	INTERPOS_usleep,
-	INTERPOS_pause,
 	INTERPOS_read,
 	INTERPOS_readv,
-	INTERPOS_wait,
-	INTERPOS_wait3,
 	INTERPOS_wait4,
-	INTERPOS_waitpid,
 	INTERPOS_write,
 	INTERPOS_writev,
 	INTERPOS__pthread_mutex_init_calloc_cb,
@@ -353,23 +344,17 @@ int		__sys_sigwait(const __sigset_t *, int *);
 int		__sys_sigwaitinfo(const __sigset_t *, struct __siginfo *);
 int		__sys_swapcontext(struct __ucontext *,
 		    const struct __ucontext *);
+int		__sys_thr_kill(long, int);
+int		__sys_thr_self(long *);
 int		__sys_truncate(const char *, __off_t);
 __pid_t		__sys_wait4(__pid_t, int *, int, struct rusage *);
 __ssize_t	__sys_write(int, const void *, __size_t);
 __ssize_t	__sys_writev(int, const struct iovec *, int);
 
-int		__libc_creat(const char *path, __mode_t mode);
-int		__libc_pause(void);
-int		__libc_raise(int);
 int		__libc_sigwait(const __sigset_t * __restrict,
 		    int * restrict sig);
 int		__libc_system(const char *);
-unsigned int	__libc_sleep(unsigned int);
 int		__libc_tcdrain(int);
-int		__libc_usleep(__useconds_t);
-__pid_t		__libc_wait(int *);
-__pid_t		__libc_wait3(int *, int, struct rusage *);
-__pid_t		__libc_waitpid(__pid_t, int *, int);
 int		__fcntl_compat(int fd, int cmd, ...);
 
 /* execve() with PATH processing to implement posix_spawnp() */
diff --git a/lib/libc/sys/interposing_table.c b/lib/libc/sys/interposing_table.c
index 9987bf0..d303779 100644
--- a/lib/libc/sys/interposing_table.c
+++ b/lib/libc/sys/interposing_table.c
@@ -44,17 +44,14 @@ interpos_func_t __libc_interposing[INTERPOS_MAX] = {
 	SLOT(aio_suspend, __sys_aio_suspend),
 	SLOT(close, __sys_close),
 	SLOT(connect, __sys_connect),
-	SLOT(creat, __libc_creat),
 	SLOT(fcntl, __fcntl_compat),
 	SLOT(fsync, __sys_fsync),
 	SLOT(fork, __sys_fork),
 	SLOT(msync, __sys_msync),
 	SLOT(nanosleep, __sys_nanosleep),
-	SLOT(open, __sys_open),
 	SLOT(openat, __sys_openat),
 	SLOT(poll, __sys_poll),
 	SLOT(pselect, __sys_pselect),
-	SLOT(raise, __libc_raise),
 	SLOT(read, __sys_read),
 	SLOT(readv, __sys_readv),
 	SLOT(recvfrom, __sys_recvfrom),
@@ -71,14 +68,8 @@ interpos_func_t __libc_interposing[INTERPOS_MAX] = {
 	SLOT(sigwaitinfo, __sys_sigwaitinfo),
 	SLOT(swapcontext, __sys_swapcontext),
 	SLOT(system, __libc_system),
-	SLOT(sleep, __libc_sleep),
 	SLOT(tcdrain, __libc_tcdrain),
-	SLOT(usleep, __libc_usleep),
-	SLOT(pause, __libc_pause),
-	SLOT(wait, __libc_wait),
-	SLOT(wait3, __libc_wait3),
 	SLOT(wait4, __sys_wait4),
-	SLOT(waitpid, __libc_waitpid),
 	SLOT(write, __sys_write),
 	SLOT(writev, __sys_writev),
 	SLOT(_pthread_mutex_init_calloc_cb, _pthread_mutex_init_calloc_cb_stub),
diff --git a/lib/libc/sys/open.c b/lib/libc/sys/open.c
index 57c0324..e0273c6 100644
--- a/lib/libc/sys/open.c
+++ b/lib/libc/sys/open.c
@@ -54,6 +54,6 @@ open(const char *path, int flags, ...)
 	} else {
 		mode = 0;
 	}
-	return (((int (*)(const char *, int, ...))
-	    __libc_interposing[INTERPOS_open])(path, flags, mode));
+	return (((int (*)(int, const char *, int, ...))
+	    __libc_interposing[INTERPOS_openat])(AT_FDCWD, path, flags, mode));
 }