xnu-4903.241.1.tar.gz

[apple/xnu.git] / bsd / sys / select.h

diff --git a/bsd/sys/select.h b/bsd/sys/select.h
index 2bc5765fada6c0f685812597ad2475c690ba7f8a..1fa3f7605e2176567ceeb50dbc8cafe63569192f 100644 (file)
--- a/bsd/sys/select.h
+++ b/bsd/sys/select.h
@@ -67,46 +67,29 @@
 #include <sys/cdefs.h>
 #include <sys/_types.h>
 
+/*
+ * [XSI] The <sys/select.h> header shall define the fd_set type as a structure.
+ * The timespec structure shall be defined as described in <time.h>
+ * The <sys/select.h> header shall define the timeval structure.
+ */
+#include <sys/_types/_fd_def.h>
+#include <sys/_types/_timespec.h>
+#include <sys/_types/_timeval.h>
+
 /*
  * The time_t and suseconds_t types shall be defined as described in
  * <sys/types.h>
  * The sigset_t type shall be defined as described in <signal.h>
- * The timespec structure shall be defined as described in <time.h>
  */
-#ifndef        _TIME_T
-#define        _TIME_T
-typedef        __darwin_time_t         time_t;
-#endif
-
-#ifndef _SUSECONDS_T
-#define _SUSECONDS_T
-typedef __darwin_suseconds_t   suseconds_t;
-#endif
-
-#ifndef _SIGSET_T
-#define _SIGSET_T
-typedef __darwin_sigset_t      sigset_t;
-#endif
-
-#ifndef _TIMESPEC
-#define _TIMESPEC
-struct timespec {
-       time_t  tv_sec;
-       long    tv_nsec;
-};
-#endif
+#include <sys/_types/_time_t.h>
+#include <sys/_types/_suseconds_t.h>
+#include <sys/_types/_sigset_t.h>
 
 /*
- * [XSI] The <sys/select.h> header shall define the fd_set type as a structure.
  * [XSI] FD_CLR, FD_ISSET, FD_SET, FD_ZERO may be declared as a function, or
  *      defined as a macro, or both
  * [XSI] FD_SETSIZE shall be defined as a macro
- *
- * Note:       We use _FD_SET to protect all select related
- *             types and macros
  */
-#ifndef _FD_SET
-#define        _FD_SET
 
 /*
  * Select uses bit masks of file descriptors in longs.  These macros
@@ -114,42 +97,19 @@ struct timespec {
  * extra protection here is to permit application redefinition above
  * the default size.
  */
-#ifndef        FD_SETSIZE
-#define        FD_SETSIZE      1024
-#endif
-
-#define        __DARWIN_NBBY   8                               /* bits in a byte */
-#define __DARWIN_NFDBITS       (sizeof(__int32_t) * __DARWIN_NBBY) /* bits per mask */
-#define        __DARWIN_howmany(x, y) (((x) + ((y) - 1)) / (y))        /* # y's == x bits? */
+#include <sys/_types/_fd_setsize.h>
+#include <sys/_types/_fd_set.h>
+#include <sys/_types/_fd_clr.h>
+#include <sys/_types/_fd_isset.h>
+#include <sys/_types/_fd_zero.h>
 
-typedef        struct fd_set {
-       __int32_t       fds_bits[__DARWIN_howmany(FD_SETSIZE, __DARWIN_NFDBITS)];
-} fd_set;
-
-#define        FD_SET(n, p)    ((p)->fds_bits[(n)/__DARWIN_NFDBITS] |= (1<<((n) % __DARWIN_NFDBITS)))
-#define        FD_CLR(n, p)    ((p)->fds_bits[(n)/__DARWIN_NFDBITS] &= ~(1<<((n) % __DARWIN_NFDBITS)))
-#define        FD_ISSET(n, p)  ((p)->fds_bits[(n)/__DARWIN_NFDBITS] & (1<<((n) % __DARWIN_NFDBITS)))
-#if __GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ >= 3
-/*
- * Use the built-in bzero function instead of the library version so that
- * we do not pollute the namespace or introduce prototype warnings.
- */
-#define        FD_ZERO(p)      __builtin_bzero(p, sizeof(*(p)))
-#else
-#define        FD_ZERO(p)      bzero(p, sizeof(*(p)))
-#endif
-#ifndef _POSIX_C_SOURCE
-#define        FD_COPY(f, t)   bcopy(f, t, sizeof(*(f)))
-#endif /* !_POSIX_C_SOURCE */
-
-#endif /* !_FD_SET */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#include <sys/_types/_fd_copy.h>
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
 
 #ifdef KERNEL
-#ifdef KERNEL_PRIVATE
-#include <kern/wait_queue.h>
-#endif
 #include <sys/kernel_types.h>
-
+#include <kern/waitq.h>
 #include <sys/event.h>
 
 /*
@@ -158,8 +118,8 @@ typedef     struct fd_set {
  */
 #ifdef KERNEL_PRIVATE
 struct selinfo {
-       struct  wait_queue si_wait_queue;       /* wait_queue for wait/wakeup */
-       struct klist si_note;           /* JMM - temporary separation */
+       struct  waitq si_waitq;         /* waitq for wait/wakeup */
+       struct  klist si_note;          /* JMM - temporary separation */
        u_int   si_flags;               /* see below */
 };
 
@@ -174,33 +134,37 @@ struct selinfo;
 
 __BEGIN_DECLS
 
+extern int selwait;
 void   selrecord(proc_t selector, struct selinfo *, void *);
 void   selwakeup(struct selinfo *);
 void   selthreadclear(struct selinfo *);
 
 __END_DECLS
 
-#endif /* KERNEL */
-
-
-#ifndef KERNEL
-#ifndef _POSIX_C_SOURCE
-#include <sys/types.h>
-#ifndef  __MWERKS__
-#include <signal.h>
-#endif /* __MWERKS__ */
-#include <sys/time.h>
-#endif /* !_POSIX_C_SOURCE */
+#else /* !KERNEL */
 
 __BEGIN_DECLS
+
 #ifndef  __MWERKS__
 int     pselect(int, fd_set * __restrict, fd_set * __restrict,
                fd_set * __restrict, const struct timespec * __restrict,
-               const sigset_t * __restrict);
+               const sigset_t * __restrict)
+#if defined(_DARWIN_C_SOURCE) || defined(_DARWIN_UNLIMITED_SELECT)
+               __DARWIN_EXTSN_C(pselect)
+#else /* !_DARWIN_C_SOURCE && !_DARWIN_UNLIMITED_SELECT */
+#  if defined(__LP64__) && !__DARWIN_NON_CANCELABLE
+               __DARWIN_1050(pselect)
+#  else /* !__LP64__ || __DARWIN_NON_CANCELABLE */
+               __DARWIN_ALIAS_C(pselect)
+#  endif /* __LP64__ && !__DARWIN_NON_CANCELABLE */
+#endif /* _DARWIN_C_SOURCE || _DARWIN_UNLIMITED_SELECT */
+               ;
 #endif /* __MWERKS__ */
-int     select(int, fd_set * __restrict, fd_set * __restrict,
-               fd_set * __restrict, struct timeval * __restrict);
+
+#include <sys/_select.h>       /* select() prototype */
+
 __END_DECLS
+
 #endif /* ! KERNEL */
 
 #endif /* !_SYS_SELECT_H_ */