Author: kib
Date: Thu Dec 13 06:24:54 2012
New Revision: 244175
URL: http://svnweb.freebsd.org/changeset/base/244175
Log:
MFC r242960:
Implement the waitid() SUSv4 function using wait6() system call.
PR: standards/170346
Added:
stable/9/lib/libc/gen/waitid.c
- copied unchanged from r242960, head/lib/libc/gen/waitid.c
Modified:
stable/9/lib/libc/gen/Makefile.inc
stable/9/lib/libc/gen/Symbol.map
stable/9/lib/libc/include/namespace.h
stable/9/lib/libc/include/un-namespace.h
stable/9/lib/libc/sys/Symbol.map
Directory Properties:
stable/9/lib/libc/ (props changed)
stable/9/lib/libc/sys/ (props changed)
Modified: stable/9/lib/libc/gen/Makefile.inc
==============================================================================
--- stable/9/lib/libc/gen/Makefile.inc Thu Dec 13 06:20:01 2012
(r244174)
+++ stable/9/lib/libc/gen/Makefile.inc Thu Dec 13 06:24:54 2012
(r244175)
@@ -34,7 +34,7 @@ SRCS+= __getosreldate.c __xuname.c \
syslog.c telldir.c termios.c time.c times.c timezone.c tls.c \
ttyname.c ttyslot.c ualarm.c ulimit.c uname.c unvis.c \
usleep.c utime.c utxdb.c valloc.c vis.c wait.c wait3.c waitpid.c \
- wordexp.c
+ waitid.c wordexp.c
CANCELPOINTS_SRCS=sem.c sem_new.c
.for src in ${CANCELPOINTS_SRCS}
Modified: stable/9/lib/libc/gen/Symbol.map
==============================================================================
--- stable/9/lib/libc/gen/Symbol.map Thu Dec 13 06:20:01 2012
(r244174)
+++ stable/9/lib/libc/gen/Symbol.map Thu Dec 13 06:24:54 2012
(r244175)
@@ -384,6 +384,7 @@ FBSD_1.3 {
fdlopen;
__FreeBSD_libc_enter_restricted_mode;
getcontextx;
+ waitid;
};
FBSDprivate_1.0 {
Copied: stable/9/lib/libc/gen/waitid.c (from r242960,
head/lib/libc/gen/waitid.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/lib/libc/gen/waitid.c Thu Dec 13 06:24:54 2012
(r244175, copy of r242960, head/lib/libc/gen/waitid.c)
@@ -0,0 +1,65 @@
+/*-
+ * Copyright (c) 2012 Jukka A. Ukkonen
+ * All rights reserved.
+ *
+ * This software was developed by Jukka Ukkonen for FreeBSD.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "namespace.h"
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <stddef.h>
+#include <string.h>
+#include <signal.h>
+#include <errno.h>
+#include "un-namespace.h"
+
+int
+__waitid(idtype_t idtype, id_t id, siginfo_t *info, int flags)
+{
+ int status;
+ pid_t ret;
+
+ ret = _wait6(idtype, id, &status, flags, NULL, info);
+
+ /*
+ * According to SUSv4, waitid() shall not return a PID when a
+ * process is found, but only 0. If a process was actually
+ * found, siginfo_t fields si_signo and si_pid will be
+ * non-zero. In case WNOHANG was set in the flags and no
+ * process was found those fields are set to zero using
+ * memset() below.
+ */
+ if (ret == 0 && info != NULL)
+ memset(info, 0, sizeof(*info));
+ else if (ret > 0)
+ ret = 0;
+ return (ret);
+}
+
+__weak_reference(__waitid, waitid);
+__weak_reference(__waitid, _waitid);
Modified: stable/9/lib/libc/include/namespace.h
==============================================================================
--- stable/9/lib/libc/include/namespace.h Thu Dec 13 06:20:01 2012
(r244174)
+++ stable/9/lib/libc/include/namespace.h Thu Dec 13 06:24:54 2012
(r244175)
@@ -229,6 +229,7 @@
#define socketpair _socketpair
#define usleep _usleep
#define wait4 _wait4
+#define wait6 _wait6
#define waitpid _waitpid
#define write _write
#define writev _writev
Modified: stable/9/lib/libc/include/un-namespace.h
==============================================================================
--- stable/9/lib/libc/include/un-namespace.h Thu Dec 13 06:20:01 2012
(r244174)
+++ stable/9/lib/libc/include/un-namespace.h Thu Dec 13 06:24:54 2012
(r244175)
@@ -210,6 +210,7 @@
#undef socketpair
#undef usleep
#undef wait4
+#undef wait6
#undef waitpid
#undef write
#undef writev
Modified: stable/9/lib/libc/sys/Symbol.map
==============================================================================
--- stable/9/lib/libc/sys/Symbol.map Thu Dec 13 06:20:01 2012
(r244174)
+++ stable/9/lib/libc/sys/Symbol.map Thu Dec 13 06:24:54 2012
(r244175)
@@ -380,6 +380,7 @@ FBSD_1.2 {
FBSD_1.3 {
posix_fadvise;
+ wait6;
};
FBSDprivate_1.0 {
@@ -1013,6 +1014,8 @@ FBSDprivate_1.0 {
__sys_vadvise;
_wait4;
__sys_wait4;
+ _wait6;
+ __sys_wait6;
_write;
__sys_write;
_writev;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
