Deleted Added
sdiff udiff text old ( 156383 ) new ( 157078 )
full compact
aio.c (156383) aio.c (157078)
1/*
2 * Copyright (c) 2005 David Xu <davidxu@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
1/*
2 * Copyright (c) 2005 David Xu <davidxu@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
26 * $FreeBSD: head/lib/librt/aio.c 156383 2006-03-07 08:28:07Z davidxu $
26 * $FreeBSD: head/lib/librt/aio.c 157078 2006-03-24 03:24:27Z davidxu $
27 *
28 */
29
30#include <sys/cdefs.h>
31#include <sys/types.h>
32#include <sys/syscall.h>
33#include <sys/aio.h>
34

--- 7 unchanged lines hidden (view full) ---

42__weak_reference(__aio_read, _aio_read);
43__weak_reference(__aio_read, aio_read);
44__weak_reference(__aio_write, _aio_write);
45__weak_reference(__aio_write, aio_write);
46__weak_reference(__aio_return, _aio_return);
47__weak_reference(__aio_return, aio_return);
48__weak_reference(__aio_waitcomplete, _aio_waitcomplete);
49__weak_reference(__aio_waitcomplete, aio_waitcomplete);
27 *
28 */
29
30#include <sys/cdefs.h>
31#include <sys/types.h>
32#include <sys/syscall.h>
33#include <sys/aio.h>
34

--- 7 unchanged lines hidden (view full) ---

42__weak_reference(__aio_read, _aio_read);
43__weak_reference(__aio_read, aio_read);
44__weak_reference(__aio_write, _aio_write);
45__weak_reference(__aio_write, aio_write);
46__weak_reference(__aio_return, _aio_return);
47__weak_reference(__aio_return, aio_return);
48__weak_reference(__aio_waitcomplete, _aio_waitcomplete);
49__weak_reference(__aio_waitcomplete, aio_waitcomplete);
50__weak_reference(__aio_fsync, _aio_fsync);
51__weak_reference(__aio_fsync, aio_fsync);
50
51typedef void (*aio_func)(union sigval val, struct aiocb *iocb);
52
53extern int __sys_aio_read(struct aiocb *iocb);
54extern int __sys_aio_write(struct aiocb *iocb);
55extern int __sys_aio_waitcomplete(struct aiocb **iocbp, struct timespec *timeout);
56extern int __sys_aio_return(struct aiocb *iocb);
57extern int __sys_aio_error(struct aiocb *iocb);
52
53typedef void (*aio_func)(union sigval val, struct aiocb *iocb);
54
55extern int __sys_aio_read(struct aiocb *iocb);
56extern int __sys_aio_write(struct aiocb *iocb);
57extern int __sys_aio_waitcomplete(struct aiocb **iocbp, struct timespec *timeout);
58extern int __sys_aio_return(struct aiocb *iocb);
59extern int __sys_aio_error(struct aiocb *iocb);
60extern int __sys_aio_fsync(int op, struct aiocb *iocb);
58
59static void
60aio_dispatch(struct sigev_node *sn)
61{
62 aio_func f = sn->sn_func;
63
64 f(sn->sn_value, (struct aiocb *)sn->sn_id);
65}
66
67static int
61
62static void
63aio_dispatch(struct sigev_node *sn)
64{
65 aio_func f = sn->sn_func;
66
67 f(sn->sn_value, (struct aiocb *)sn->sn_id);
68}
69
70static int
68aio_io(struct aiocb *iocb, int (*sysfunc)(struct aiocb *iocb))
71aio_sigev_alloc(struct aiocb *iocb, struct sigev_node **sn,
72 struct sigevent *saved_ev)
69{
73{
70 struct sigev_node *sn;
71 struct sigevent saved_ev;
72 int ret, err;
73
74 if (iocb->aio_sigevent.sigev_notify != SIGEV_THREAD) {
75 ret = sysfunc(iocb);
76 return (ret);
77 }
78
79 if (__sigev_check_init()) {
80 /* This might be that thread library is not enabled. */
81 errno = EINVAL;
82 return (-1);
83 }
84
74 if (__sigev_check_init()) {
75 /* This might be that thread library is not enabled. */
76 errno = EINVAL;
77 return (-1);
78 }
79
85 sn = __sigev_alloc(SI_ASYNCIO, &iocb->aio_sigevent, NULL, 1);
86 if (sn == NULL) {
80 *sn = __sigev_alloc(SI_ASYNCIO, &iocb->aio_sigevent, NULL, 1);
81 if (*sn == NULL) {
87 errno = EAGAIN;
88 return (-1);
89 }
90
82 errno = EAGAIN;
83 return (-1);
84 }
85
91 saved_ev = iocb->aio_sigevent;
92 sn->sn_id = (sigev_id_t)iocb;
93 __sigev_get_sigevent(sn, &iocb->aio_sigevent, sn->sn_id);
86 *saved_ev = iocb->aio_sigevent;
87 (*sn)->sn_id = (sigev_id_t)iocb;
88 __sigev_get_sigevent(*sn, &iocb->aio_sigevent, (*sn)->sn_id);
89 (*sn)->sn_dispatch = aio_dispatch;
94
95 __sigev_list_lock();
90
91 __sigev_list_lock();
96 __sigev_register(sn);
92 __sigev_register(*sn);
97 __sigev_list_unlock();
98
93 __sigev_list_unlock();
94
99 sn->sn_dispatch = aio_dispatch;
95 return (0);
96}
97
98static int
99aio_io(struct aiocb *iocb, int (*sysfunc)(struct aiocb *iocb))
100{
101 struct sigev_node *sn;
102 struct sigevent saved_ev;
103 int ret, err;
104
105 if (iocb->aio_sigevent.sigev_notify != SIGEV_THREAD) {
106 ret = sysfunc(iocb);
107 return (ret);
108 }
109
110 ret = aio_sigev_alloc(iocb, &sn, &saved_ev);
111 if (ret)
112 return (ret);
100 ret = sysfunc(iocb);
101 iocb->aio_sigevent = saved_ev;
113 ret = sysfunc(iocb);
114 iocb->aio_sigevent = saved_ev;
102
103 if (ret != 0) {
104 err = errno;
105 __sigev_list_lock();
106 __sigev_delete_node(sn);
107 __sigev_list_unlock();
108 errno = err;
109 }
110 return (ret);

--- 41 unchanged lines hidden (view full) ---

152 return (EINPROGRESS);
153 __sigev_list_lock();
154 __sigev_delete(SI_ASYNCIO, (sigev_id_t)iocb);
155 __sigev_list_unlock();
156 }
157
158 return __sys_aio_return(iocb);
159}
115 if (ret != 0) {
116 err = errno;
117 __sigev_list_lock();
118 __sigev_delete_node(sn);
119 __sigev_list_unlock();
120 errno = err;
121 }
122 return (ret);

--- 41 unchanged lines hidden (view full) ---

164 return (EINPROGRESS);
165 __sigev_list_lock();
166 __sigev_delete(SI_ASYNCIO, (sigev_id_t)iocb);
167 __sigev_list_unlock();
168 }
169
170 return __sys_aio_return(iocb);
171}
172
173int
174__aio_fsync(int op, struct aiocb *iocb)
175{
176 struct sigev_node *sn;
177 struct sigevent saved_ev;
178 int ret, err;
179
180 if (iocb->aio_sigevent.sigev_notify != SIGEV_THREAD)
181 return __sys_aio_fsync(op, iocb);
182
183 ret = aio_sigev_alloc(iocb, &sn, &saved_ev);
184 if (ret)
185 return (ret);
186 ret = __sys_aio_fsync(op, iocb);
187 iocb->aio_sigevent = saved_ev;
188 if (ret != 0) {
189 err = errno;
190 __sigev_list_lock();
191 __sigev_delete_node(sn);
192 __sigev_list_unlock();
193 errno = err;
194 }
195 return (ret);
196}