X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8ad349bb6ed4a0be06e34c92be0d98b92e078db4..d41d1dae2cd00cc08c7982087d1c445180cad9f5:/bsd/sys/aio.h

diff --git a/bsd/sys/aio.h b/bsd/sys/aio.h
index cfa2eaeaf..d4f7e7a68 100644
--- a/bsd/sys/aio.h
+++ b/bsd/sys/aio.h
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2003-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2003-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code 
- * as defined in and that are subject to the Apple Public Source License 
- * Version 2.0 (the 'License'). You may not use this file except in 
- * compliance with the License.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, unlawful or unlicensed copies of an Apple operating 
- * system, or to circumvent, violate, or enable the circumvention or 
- * violation of, any terms of an Apple operating system software license 
- * agreement.
- *
- * Please obtain a copy of the License at 
- * http://www.opensource.apple.com/apsl/ and read it before using this 
- * file.
- *
- * The Original Code and all software distributed under the License are 
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* 
  *	File:	sys/aio.h
@@ -40,38 +38,89 @@
 #define	_SYS_AIO_H_
 
 #include <sys/signal.h>
+#include <sys/_types.h>
 #include <sys/cdefs.h>
 
+/*
+ * [XSI] Inclusion of the <aio.h> header may make visible symbols defined
+ * in the headers <fcntl.h>, <signal.h>, <sys/types.h>, and <time.h>.
+ * 
+ * In our case, this is limited to struct timespec, off_t and ssize_t.
+ */
+#define __need_struct_timespec
+#ifdef KERNEL
+#define __need_struct_user64_timespec
+#define __need_struct_user32_timespec
+#endif /* KERNEL */
+#include <sys/_structs.h>
+
+#ifndef _OFF_T
+typedef __darwin_off_t	off_t;
+#define _OFF_T
+#endif
+
+#ifndef	_SSIZE_T
+#define	_SSIZE_T
+typedef	__darwin_ssize_t	ssize_t;
+#endif
+
+/*
+ * A aio_fsync() options that the calling thread is to continue execution
+ * while the lio_listio() operation is being performed, and no notification
+ * is given when the operation is complete
+ *
+ * [XSI] from <fcntl.h>
+ */
+#ifndef O_SYNC		/* allow simultaneous inclusion of <fcntl.h> */
+#define	O_SYNC			0x0080		/* synch I/O file integrity */
+#endif
+
+#ifndef O_DSYNC		/* allow simultaneous inclusion of <fcntl.h> */
+#define	O_DSYNC			0x400000	/* synch I/O data integrity */
+#endif
+
+
 struct aiocb {
-	int					aio_fildes;		/* File descriptor */
-	off_t				aio_offset;		/* File offset */
-	volatile void		*aio_buf;		/* Location of buffer */
-	size_t				aio_nbytes;		/* Length of transfer */
-	int					aio_reqprio;	/* Request priority offset */
-	struct sigevent		aio_sigevent;	/* Signal number and value */
-	int					aio_lio_opcode;	/* Operation to be performed */
+	int		aio_fildes;		/* File descriptor */
+	off_t		aio_offset;		/* File offset */
+	volatile void	*aio_buf;		/* Location of buffer */
+	size_t		aio_nbytes;		/* Length of transfer */
+	int		aio_reqprio;		/* Request priority offset */
+	struct sigevent	aio_sigevent;		/* Signal number and value */
+	int		aio_lio_opcode;		/* Operation to be performed */
 };
 
-// LP64todo - should this move?
 #ifdef KERNEL
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-
 struct user_aiocb {
-	int					aio_fildes;		/* File descriptor */
-	off_t				aio_offset;		/* File offset */
-	user_addr_t			aio_buf;		/* Location of buffer */
-	user_size_t			aio_nbytes;		/* Length of transfer */
-	int					aio_reqprio;	/* Request priority offset */
+	int		aio_fildes;		/* File descriptor */
+	off_t		aio_offset; /* File offset */
+	user_addr_t	aio_buf;		/* Location of buffer */
+	user_size_t	aio_nbytes;		/* Length of transfer */
+	int		aio_reqprio;	/* Request priority offset */
 	struct user_sigevent aio_sigevent;	/* Signal number and value */
-	int					aio_lio_opcode;	/* Operation to be performed */
+	int		aio_lio_opcode;		/* Operation to be performed */
 };
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
+struct user64_aiocb {
+	int		aio_fildes;		/* File descriptor */
+	user64_off_t		aio_offset; /* File offset */
+	user64_addr_t	aio_buf;		/* Location of buffer */
+	user64_size_t	aio_nbytes;		/* Length of transfer */
+	int		aio_reqprio;	/* Request priority offset */
+	struct user64_sigevent aio_sigevent;	/* Signal number and value */
+	int		aio_lio_opcode;		/* Operation to be performed */
+};
+
+struct user32_aiocb {
+	int		aio_fildes;		/* File descriptor */
+	user32_off_t		aio_offset;		/* File offset */
+	user32_addr_t	aio_buf;		/* Location of buffer */
+	user32_size_t	aio_nbytes;		/* Length of transfer */
+	int		aio_reqprio;		/* Request priority offset */
+	struct user32_sigevent	aio_sigevent;		/* Signal number and value */
+	int		aio_lio_opcode;		/* Operation to be performed */
+};
 
 #endif // KERNEL
 
@@ -127,19 +176,6 @@ struct user_aiocb {
  */
 #define	AIO_LISTIO_MAX		16
 
-/*
- * A aio_fsync() options
- * that the calling thread is to continue execution while
- * the lio_listio() operation is being performed, and no
- * notification is given when the operation is complete
- */
-
-#ifndef O_SYNC	/* XXX investigate documentation error */
-#define	O_SYNC			0x0080 	/* queued IO is completed as if by fsync() */
-#endif
-#if 0 /* O_DSYNC - NOT SUPPORTED */
-#define	O_DSYNC			0x1		/* queued async IO is completed as if by fdatasync() */
-#endif
 
 #ifndef KERNEL
 /*
@@ -231,7 +267,7 @@ ssize_t	aio_return( struct aiocb * aiocbp );
  */
 int		aio_suspend( const struct aiocb *const aiocblist[], 
 					 int nent,
-	 				 const struct timespec * timeoutp );
+	 				 const struct timespec * timeoutp ) __DARWIN_ALIAS_C(aio_suspend);
 	 				 
 /*
  * Write aiocbp->aio_nbytes to the file associated with aiocbp->aio_fildes from